Merge remote-tracking branch 'lsk/v3.10/topic/arm64-kgdb' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 16:35:46 +0000 (17:35 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 16:35:46 +0000 (17:35 +0100)
commitd8e72f6b168e8f91d2fae7902c7c43eae9c4c880
tree3819ad9ac5caa55fbcec63418bafa39ff2682bc8
parent49c72bffd230ecee5f69afc0a83d9bd2617ea9eb
parent9da2fb2070585c138ccd041f0c4f9e72886312e6
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-kgdb' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/debug-monitors.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/debug-monitors.c
arch/arm64/Kconfig
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/entry.S