]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'cross-platform/debug_ll' into imx/imx6q
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 21:35:14 +0000 (23:35 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 21:35:14 +0000 (23:35 +0200)
commit08537a77d88ab250c391c9b5d4494af3f33337a0
tree3ade112eff51fb8f5e8ed83b629badeed4be1a0b
parenta7c72bbee35cf726c77ab570b2cdc1dad0001996
parentf350b86121c7a004a5f866333fa1d23fe30263a6
Merge branch 'cross-platform/debug_ll' into imx/imx6q

Conflicts:
arch/arm/Kconfig.debug
arch/arm/Kconfig.debug