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

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