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-01-31 09:21:55 -08:00
2014-03-17 11:27:39 -07:00
2014-02-17 11:24:48 +01:00
2014-03-07 09:52:46 -08:00
2014-01-30 17:08:41 -08:00
2014-02-24 00:34:36 -08:00