Merge branch 'cross-platform/debug_ll' into imx/imx6q
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:24:41 +0000 (14:24 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:24:41 +0000 (14:24 +0100)
Conflicts:
arch/arm/Kconfig.debug


Trivial merge