| commit | e40bffaeaed9c5a26c3e5c961c3dee72c1b46558 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 17 11:27:39 2014 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Mar 17 11:27:39 2014 -0700 |
| tree | 619aa9f481fbddb267dcd6f1ef454c846bdfc983 | |
| parent | cc43adab9a5b7f3b7c320ded7dbd771aca421f1a [diff] | |
| parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 [diff] |
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>