Merge remote-tracking branch 'pwm/for-next'

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

Tue, 9 Oct 2012 02:54:00 +0000 (13:54 +1100)

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

Tue, 9 Oct 2012 02:54:00 +0000 (13:54 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:54:00 +0000 (13:54 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:54:00 +0000 (13:54 +1100)
diff --cc Documentation/devicetree/bindings/pwm/mxs-pwm.txt
Simple merge
diff --cc arch/unicore32/Kconfig
Simple merge
diff --cc drivers/misc/Kconfig
Simple merge
diff --cc drivers/pwm/Kconfig
Simple merge
diff --cc drivers/pwm/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 9 Oct 2012 02:54:00 +0000 (13:54 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 9 Oct 2012 02:54:00 +0000 (13:54 +1100)
		1	2
Documentation/devicetree/bindings/pwm/mxs-pwm.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/unicore32/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pwm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pwm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history