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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/misc/mei/hbm.c
Simple merge

diff --cc drivers/misc/mei/init.c
Simple merge

diff --cc drivers/net/netconsole.c
Simple merge

diff --cc drivers/pcmcia/Kconfig
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/Kconfig
Simple merge

diff --cc net/core/netpoll.c
Simple merge