projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ea521db 9e82bf0)
Merge 3.17-rc5 into staging-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2014 02:33:47 +0000 (19:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2014 02:33:47 +0000 (19:33 -0700)
commitcaf382fe31b7327a1e4449f1c05c0cc7fb5b90be
treeb7b0fcbf594db884a68cbc354ed933b5c8ad6d61tree | snapshot
parentea521dbc48c1550a4302c851a1e77f5b84ac8f81commit | diff
parent9e82bf014195d6f0054982c463575cdce24292becommit | diff
Merge 3.17-rc5 into staging-next.

This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
drivers/staging/android/sync.c diff1 | diff2 | blob | history
drivers/staging/imx-drm/ipuv3-plane.c diff1 | diff2 | blob | history
drivers/staging/lustre/lustre/llite/llite_lib.c diff1 | diff2 | blob | history
Domain: System / Kernel;