]> 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)
commit32c33c3d6732ee253fee08d6d463cf1d0be5a14c
tree60380e1417830f50683c3945e2fb9ee110418cbb
parentf221a5fa7a079e7705acc285cfc5683e8c91d182
parenta61963fb4f9b83e82374a49d786673f07523bb0b
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