Merge 4.7-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2016 14:29:44 +0000 (07:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2016 14:29:44 +0000 (07:29 -0700)
commit194c8581eb9b6d42e9232c7693d86d2ee3799986
tree86d926b7407c33379dd719fad2ccaf03d5c5228a
parentc0ff9019ee64101fda8f19338da799fda8217e14
parent33688abb2802ff3a230bd2441f765477b94cc89e
Merge 4.7-rc4 into char-misc-next

We want those fixes in here to help with merge issues.

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