]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pwm/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:23 +0000 (15:02 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:23 +0000 (15:02 +0200)
commit645766abf88a9bde05de54c23a2f30fbdbfba746
tree375490573b7af26105d3cb70d082ffe283f8c6c0
parent62f5694343e6f6389d37e410178936186346ebbd
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