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
..
2013-04-05 12:22:58 -06:00
2013-10-23 16:55:15 +02:00
2013-06-13 22:12:15 +01:00
2013-03-20 11:27:27 +10:30
2013-10-08 23:52:16 +02:00
2005-04-16 15:20:36 -07:00
2013-11-15 14:06:38 -08:00
2013-11-07 10:40:47 -03:00
2011-03-31 11:26:23 -03:00
2011-05-19 15:59:38 -07:00
2009-09-19 11:42:12 +02:00
2012-10-08 13:50:19 +10:30
2013-09-25 17:17:01 +01:00
2005-04-16 15:20:36 -07:00
2013-11-07 10:47:13 +01:00
2011-06-13 00:04:57 +02:00
2010-03-07 21:19:57 +01:00
2013-08-28 17:00:47 +02:00
2013-11-21 16:42:27 -08:00
2013-03-02 20:09:55 +00:00
2012-09-25 08:59:21 -07:00
2011-04-29 15:38:55 +02:00
2007-07-16 21:15:50 +02:00
2007-07-16 21:15:50 +02:00
2013-07-03 22:58:20 +02:00
2013-09-13 13:06:59 +02:00
2009-09-23 07:39:28 -07:00
2013-04-29 15:54:27 -07:00
2013-02-22 11:52:31 +01:00
2013-09-01 21:24:51 +02:00
2013-11-13 12:09:32 +09:00
2011-05-24 16:07:07 +02:00
2011-02-10 15:23:03 +01:00
2011-08-31 16:12:17 +02:00
2012-03-24 09:38:56 +00:00
2012-10-03 09:03:24 +02:00
2012-10-03 09:03:24 +02:00
2012-10-03 09:03:24 +02:00
2013-11-13 12:09:26 +09:00
2013-04-29 18:28:14 -07:00
2012-06-27 12:44:29 -07:00
2010-03-23 12:26:38 +01:00
2012-03-26 14:54:27 +02:00
2013-05-17 22:10:35 +02:00
2011-11-22 14:47:50 -08:00
2013-11-15 14:06:38 -08:00
2013-04-08 11:47:41 +02:00
2013-11-15 14:09:15 -08:00
2008-04-29 08:06:04 -07:00
2013-11-02 09:13:02 +10:30
2012-10-08 13:50:19 +10:30
2012-10-17 12:25:44 +01:00
2013-03-20 11:27:27 +10:30
2010-03-11 11:15:22 +01:00
2012-10-15 13:01:05 -07:00
2013-05-17 22:10:35 +02:00
2010-06-12 00:00:29 +02:00
2008-04-25 20:18:48 +02:00
2013-10-17 19:43:30 -07:00
2010-06-10 12:23:08 +02:00
2012-11-06 11:52:24 +10:30
2013-09-23 15:45:03 +09:30
2012-12-14 13:05:28 +10:30
2007-10-15 22:25:06 +02:00
2010-06-01 08:55:52 -07:00
2011-04-29 15:55:45 +02:00
2011-07-20 17:08:08 +02:00
2012-07-20 10:36:05 +02:00
2011-01-07 14:31:01 +01:00
2005-04-16 15:20:36 -07:00
2011-05-19 16:55:27 +09:30
2010-10-28 00:59:56 +02:00
2012-03-30 15:23:36 +02:00
2012-11-20 11:58:03 +01:00
2010-03-07 21:39:33 +01:00
2013-03-02 20:09:55 +00:00
2012-08-23 11:24:43 -04:00
2013-11-05 16:07:50 -05:00
2013-06-24 00:08:01 +02:00
2013-10-23 17:13:42 +02:00
2013-01-25 16:55:36 +10:30
2013-11-13 12:09:00 +09:00
2013-11-13 12:09:00 +09:00
2013-11-08 10:57:20 +01:00
2011-01-22 15:50:59 +01:00
2009-06-09 22:37:54 +02:00
2012-04-18 13:13:18 -07:00