Merge remote-tracking branch 'char-misc/char-misc-next'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/m68k/mac/misc.c
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/misc/mic/vop/vop_main.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge