John Stultz 3bacba6609 Merge tag 'v3.13-rc1' into linaro-android-3.13-merge ...

Linux 3.13-rc1

Merge Linus' 3.13-rc1 into linaro-android tree.

Lots of conflicts, but I think they're sorted out.

Signed-off-by: John Stultz <john.stultz@linaro.org>

Conflicts:
	arch/arm/include/asm/hardirq.h
	arch/arm/include/asm/hardware/coresight.h
	arch/arm/include/asm/smp.h
	arch/arm/kernel/smp.c
	drivers/base/power/main.c
	drivers/iio/industrialio-event.c
	drivers/input/evdev.c
	drivers/mmc/core/core.c
	drivers/mmc/core/sd.c
	include/linux/serial_core.h
	kernel/debug/debug_core.c
	net/Kconfig
	net/Makefile
	net/bluetooth/af_bluetooth.c
	net/ipv4/af_inet.c
	net/ipv6/af_inet6.c
	net/netfilter/xt_socket.c

2013-11-25 19:38:19 -08:00

..

kdb

Merge tag 'v3.13-rc1' into linaro-android-3.13-merge

2013-11-25 19:38:19 -08:00

debug_core.c

Merge tag 'v3.13-rc1' into linaro-android-3.13-merge

2013-11-25 19:38:19 -08:00

debug_core.h

kdb: Add support for external NMI handler to call KGDB/KDB

2013-10-03 18:47:54 +02:00

gdbstub.c

Merge tag 'for_linux-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb

2013-03-02 08:31:39 -08:00

Makefile

kdb: core for kgdb back end (1 of 2)

2010-05-20 21:04:20 -05:00