Merge 3.16-rc6 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 17:07:25 +0000 (10:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 17:07:25 +0000 (10:07 -0700)
We want the platform changes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/base/platform.c
drivers/gpu/drm/nouveau/nouveau_drm.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge