Greg Kroah-Hartman e40bffaeae Merge 3.14-rc7 into staging-next
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17 11:27:39 -07:00
..
2014-02-14 16:13:00 -08:00
2014-02-21 09:55:32 -08:00
2014-03-17 11:27:39 -07:00
2014-03-09 19:27:31 -07:00
2014-02-14 10:32:28 -08:00
2014-01-15 14:51:22 -08:00
2014-03-04 08:41:42 -08:00
2014-03-15 12:41:53 -07:00
2014-03-17 11:27:39 -07:00
2014-03-17 11:27:39 -07:00
2014-03-04 07:55:47 -08:00
2014-01-22 22:24:35 -08:00
2014-02-12 12:28:05 -08:00