Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
	drivers/mfd/arizona-core.c

diff --cc drivers/mfd/as3722.c
Simple merge

diff --cc drivers/mfd/db8500-prcmu.c
Simple merge

diff --cc drivers/mfd/tps65910.c
Simple merge

diff --cc drivers/staging/nvec/nvec.c
Simple merge