]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'heads/cleanup', 'heads/dt', 'heads/soc', 'heads/boards', 'heads/defco...
authorSimon Horman <horms@verge.net.au>
Thu, 13 Sep 2012 06:12:27 +0000 (15:12 +0900)
committerSimon Horman <horms@verge.net.au>
Thu, 13 Sep 2012 06:12:27 +0000 (15:12 +0900)
commit488fe1f92bb80130e8ad94357ffe91f247fb1e22
tree6a294dc6535326675ee9092ac9b557c809507caf
parentaa9c1ba4412d2f9348b6e700aa4831569a25a7ca
parentc88a79a7789b2909ad1cf69ea2c9142030bbd6f4
parent263510ec774b490dffbd0b8db7b723025cf560c9
parentb22f6bb030ee0c98839fe2445571c57c9f89594e
parentf0a1f1c226b64859448bfc247dbf8835c4c5cf06
parentb7a3ce41bb1ca65954029fb002373524bafb3161
parente433d4440bf7dd5955a4616cfb9bffd1ec6ab839
parentb8f7b86b587edbabc9c4398f797a87d98acd5ca6
Merge branches 'heads/cleanup', 'heads/dt', 'heads/soc', 'heads/boards', 'heads/defconfig', 'heads/gpio', 'heads/pmu' and 'heads/errata' into next

Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/Kconfig
arch/arm/configs/armadillo800eva_defconfig
arch/arm/configs/kzm9g_defconfig
arch/arm/configs/marzen_defconfig
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/board-marzen.c
arch/arm/plat-samsung/devs.c
drivers/gpio/Kconfig
drivers/gpio/gpio-em.c