Greg Kroah-Hartman caf382fe31 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>

2014-09-14 19:33:47 -07:00

..

drm

drm/ast: AST2000 cannot be detected correctly

2014-09-12 13:41:39 +10:00

host1x

…

ipu-v3

…

vga

…

Makefile

…