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

Conflicts:
	arch/arm/mach-omap2/board-zoom-peripherals.c

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-hmt.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smartq.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
Simple merge