Merge char-misc-next into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Feb 2016 22:46:24 +0000 (14:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Feb 2016 22:46:24 +0000 (14:46 -0800)
commitbb27d4998a9e8767674e8eda225c82cc149e5bc8
treedcabb8b8cc510003637323b30ed414b1a1ec86f6
parent9676e84dfd641e3366a41f2c45ac5c55dbac820f
parent35bf7692e765c2275bf93fe573f7ca868ab73453
Merge char-misc-next into staging-next

This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.

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