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	drm/tegra: Make job submission 64-bit safe	2014-08-04 10:07:36 +02:00
ipu-v3	gpu: ipu-v3: Add ipu-cpmem unit	2014-08-18 14:17:41 +02:00
vga	vgaarb: We can own non-decoded resources	2014-07-08 11:15:09 +10:00
Makefile	gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging	2014-06-04 11:06:52 +02:00