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

diff --cc drivers/misc/mei/hw-me.c
Simple merge

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

diff --cc drivers/misc/mei/mei_dev.h
Simple merge

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

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