Merge branch 'android-3.10' into android-goldfish-3.10
authorGreg Hackmann <ghackmann@google.com>
Tue, 16 Sep 2014 18:11:13 +0000 (11:11 -0700)
committerGreg Hackmann <ghackmann@google.com>
Tue, 16 Sep 2014 18:11:13 +0000 (11:11 -0700)
commit942036d08d2076742543a52bf12ebde9bce3ef38
treeb8c8321afd20b60d7ff6d77bf69d706bdd582703
parente208a8a450bbc3809789a8d39795d5ed605d1322
parent3868e7f8d47992922756d1aa6590f0d556c669b8
Merge branch 'android-3.10' into android-goldfish-3.10

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

Change-Id: Ifb43a8bad9636ee48ff52a29592af95e959a4399
arch/arm64/Kconfig
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/setup.c
arch/arm64/mm/proc.S