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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/hw_random/mxc-rnga.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/wm5102-tables.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/net/ethernet/fujitsu/fmvj18x_cs.c
Simple merge

diff --cc drivers/net/ethernet/xircom/xirc2ps_cs.c
Simple merge

diff --cc drivers/scsi/pcmcia/nsp_cs.c
Simple merge

diff --cc include/linux/mfd/arizona/registers.h
Simple merge