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)
commitccfa8b21f20099b950b4f2f75d2330fb149a2012
tree60380e1417830f50683c3945e2fb9ee110418cbb
parent7e0cac630c7c90f12a78131df9913657fa30243b
parentf350b86121c7a004a5f866333fa1d23fe30263a6
Merge branch 'cross-platform/debug_ll' into imx/imx6q

Conflicts:
arch/arm/Kconfig.debug
arch/arm/Kconfig.debug
arch/arm/mach-mxs/include/mach/debug-macro.S
arch/arm/mach-realview/include/mach/debug-macro.S
arch/arm/plat-mxc/include/mach/debug-macro.S