Greg Kroah-Hartman 4096e645d8 Merge 4.6-rc7 into staging-next ... This fixes some merge issues with some iio drivers that were found in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2016-05-09 13:20:04 +02:00
..
drm	Merge 4.6-rc7 into staging-next	2016-05-09 13:20:04 +02:00
host1x	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2016-03-21 13:48:00 -07:00
ipu-v3	gpu: ipu-v3: Fix imx-ipuv3-crtc module autoloading	2016-05-05 10:34:52 +10:00
vga	vga_switcheroo: Add support for switching only the DDC	2016-02-09 11:21:07 +01:00
Makefile