Merge remote-tracking branch 'lsk/v3.10/topic/arm64-kgdb' into lsk-v3.10-arm64-misc
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 17:39:39 +0000 (18:39 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 17:39:39 +0000 (18:39 +0100)
commit7b1f792f1f89c3dc0f43ab0f9339c01e2d9f5301
tree0457772e4ef60e8477ced5c2e1f1732d274c7a22
parent8a411cf1c24488b9be28cbf8047259dfa785f8ce
parent9da2fb2070585c138ccd041f0c4f9e72886312e6
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-kgdb' into lsk-v3.10-arm64-misc

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