]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitae5ae604ce269ee81164c8e546d13d676c814907
tree60380e1417830f50683c3945e2fb9ee110418cbb
parentc191d907a02f28288ed55bf985c7a9e62dde2022
parente4662e98769c4880e6a4bbc99a1be1f4d70c2a18
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