Merge 4.0-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Apr 2015 09:17:34 +0000 (11:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Apr 2015 09:17:34 +0000 (11:17 +0200)
We want the fixes in here, and to help resolve merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge