]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pwm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:42:07 +0000 (12:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:42:07 +0000 (12:42 +1000)
commit5dfd03f0e7ecd63f04c9e628d8d1dc6ed4ee9dd9
treee9b75d9252aa7df14312561abf83cf3a0289acba
parentd7362cdfbc8491681d9fe9cf7ff18820fac30326
parentd295b129762bf6b2b7541243f496e363580de4a2
Merge remote-tracking branch 'pwm/for-next'

Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-dt-tegra30.c
arch/arm/plat-samsung/Makefile
drivers/pwm/pwm-samsung.c
16 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/dts/tegra20.dtsi
arch/arm/boot/dts/tegra30.dtsi
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-dt-tegra30.c
arch/arm/mach-vt8500/Makefile
arch/arm/plat-mxc/Makefile
arch/arm/plat-samsung/Makefile
arch/blackfin/Kconfig
drivers/Kconfig
drivers/Makefile
drivers/mfd/Kconfig
drivers/misc/Kconfig
drivers/video/backlight/Kconfig
include/linux/of.h