]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pwm/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:49:51 +0000 (11:49 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:49:51 +0000 (11:49 +0200)
commita0af47c5398d790516897b5d56d6ee26b297ef8d
treee43e3e23449447c27e64c50ba24d969a167e919b
parenta3b0272e257f801864107a55f79a13eb7093660c
parent702e304f198f631d746d2f383c54acc07d604700
Merge remote-tracking branch 'pwm/for-next'

Conflicts:
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-hmt.c
arch/arm/mach-s3c64xx/mach-smartq.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-shmobile/board-armadillo800eva.c
drivers/misc/Kconfig
drivers/misc/Makefile