]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/cleanup' into for-next
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 23:20:27 +0000 (16:20 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 23:21:04 +0000 (16:21 -0700)
commit63a2705a1515d152d64de9c417921f9b628b9f0f
tree82557b0510f608979c07cbd14fb6fdbbe19a4ada
parent204d25f93522a1e7f0d98c05b1793370e8560268
parent7ad8f8f1c5a3a92a303fcf90cb2b15205c0a7635
Merge branch 'next/cleanup' into for-next

* next/cleanup:
  ARM: mach-shmobile: remove duplicated include from board-ag5evm.c
  ARM: mach-pnx4008: Remove architecture

Resolving add/remove conflict in arch/arm/mach-pnx4008/time.c
arch/arm/Kconfig
arch/arm/arm-soc-for-next-contents.txt