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)
commit90125edbc49ec58b9101c4271bb1d87b04a4620f
tree068353d4234435b17ade687b50a5d5015bdf1ad9
parent0a8adf584759cbcbce5d88d419db01a8d0373abf
parent9a3c4145af32125c5ee39c0272662b47307a8323
Merge 3.16-rc6 into driver-core-next

We want the platform changes in here as well.

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