Merge 4.1-rc7 into staging-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:34:44 +0000 (10:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:34:44 +0000 (10:34 -0700)
commit6394d6d01bf0881823522f37601cbf880bc61087
treee5827ff7dc8b63014d9b068037ce50a5861b0f46
parent084861124d00b046cb4159b0158e1b74626b8257
parentd4a4f75cd8f29cd9464a5a32e9224a91571d6649
Merge 4.1-rc7 into staging-testing

We want the staging tree fixes in here too to help with testing and
merge issues.

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