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

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

Fri, 20 Dec 2013 05:15:39 +0000 (16:15 +1100)

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

Fri, 20 Dec 2013 05:15:39 +0000 (16:15 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 05:15:39 +0000 (16:15 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 05:15:39 +0000 (16:15 +1100)
diff --cc Documentation/devicetree/bindings/arm/atmel-at91.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/misc/mic/host/mic_device.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 20 Dec 2013 05:15:39 +0000 (16:15 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 20 Dec 2013 05:15:39 +0000 (16:15 +1100)
		1	2
Documentation/devicetree/bindings/arm/atmel-at91.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/mic/host/mic_device.h	patch \|	diff1 \|	diff2 \|	blob \| history