Merge 4.5-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Mar 2016 00:10:45 +0000 (16:10 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Mar 2016 00:10:45 +0000 (16:10 -0800)
commit3e66848a3249105fe4973b0550b5b6cd42240168
tree3ff7bbcf2a476291f5536ea09b256c541c4456f3
parent2cda64cf6998a1d10961f69e2ac79c69b6d37795
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af
Merge 4.5-rc6 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/android/binder.c