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

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 05:43:55 +0000 (15:43 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 05:43:55 +0000 (15:43 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 05:43:55 +0000 (15:43 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 05:43:55 +0000 (15:43 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/Makefile
Simple merge
diff --cc drivers/misc/Kconfig
Simple merge
diff --cc drivers/misc/genwqe/card_utils.c
Simple merge
diff --cc include/linux/mfd/palmas.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 05:43:55 +0000 (15:43 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 05:43:55 +0000 (15:43 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/genwqe/card_utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mfd/palmas.h	patch \|	diff1 \|	diff2 \|	blob \| history