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

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

Fri, 28 Sep 2012 05:27:41 +0000 (15:27 +1000)

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

Fri, 28 Sep 2012 05:27:41 +0000 (15:27 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 05:27:41 +0000 (15:27 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 05:27:41 +0000 (15:27 +1000)
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>
	Fri, 28 Sep 2012 05:27:41 +0000 (15:27 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Sep 2012 05:27:41 +0000 (15:27 +1000)
		1	2
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