Rohit Vaswani a76e99abc5
Merge branch 'Linux 3.0.21' into msm-3.0 ...
Merge Upstream's stable 3.0.21 branch into msm-3.0
This consists 814 commits and some merge conflicts.
The merge conflicts are because of some local changes to
msm-3.0 as well as some conflicts between google's tree and
the upstream tree.
Conflicts:
arch/arm/kernel/head.S
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
drivers/mmc/core/core.c
drivers/tty/serial/serial_core.c
drivers/usb/host/ehci-hub.c
drivers/usb/serial/qcserial.c
fs/namespace.c
fs/proc/base.c
Change-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org >
2012-03-30 00:09:34 -07:00
2011-05-02 22:48:03 +02:00
2010-12-03 12:27:01 +01:00
2011-03-31 11:26:23 -03:00
2011-03-17 15:13:56 +01:00
2012-01-25 17:24:47 -08:00
2011-10-03 09:57:10 -07:00
2011-05-25 12:03:47 -07:00
2011-03-31 11:26:23 -03:00
2011-05-19 15:59:38 -07:00
2011-05-02 22:48:03 +02:00
2011-03-22 17:44:17 -07:00
2011-12-14 14:12:38 -08:00
2010-03-07 21:19:57 +01:00
2010-06-03 10:39:39 +02:00
2012-03-12 08:34:35 -07:00
2011-05-18 23:24:50 +02:00
2010-12-20 15:40:33 +01:00
2011-04-29 15:38:55 +02:00
2010-10-28 00:32:23 +02:00
2010-12-15 15:44:31 +01:00
2010-06-04 10:26:35 +02:00
2011-07-12 13:36:30 +02:00
2011-05-02 22:48:03 +02:00
2011-05-24 16:07:07 +02:00
2011-02-10 15:23:03 +01:00
2010-09-24 09:12:25 +02:00
2012-02-28 16:16:17 -08:00
2011-05-24 13:31:37 -07:00
2011-03-22 17:44:13 -07:00
2010-11-25 06:50:49 +09:00
2010-03-23 12:26:38 +01:00
2010-12-14 17:05:08 +01:00
2010-12-14 15:06:04 +01:00
2010-12-14 22:16:19 +01:00
2011-05-12 17:23:40 +02:00
2011-05-16 16:39:28 +02:00
2011-03-31 11:26:23 -03:00
2011-05-02 22:48:03 +02:00
2011-06-09 11:48:19 +02:00
2011-05-24 13:31:37 -07:00
2010-03-11 11:15:22 +01:00
2011-04-28 18:01:41 +02:00
2010-06-12 00:00:29 +02:00
2011-04-18 14:24:36 +02:00
2010-06-10 12:23:08 +02:00
2011-10-03 09:57:10 -07:00
2010-06-01 08:55:52 -07:00
2011-04-29 15:55:45 +02:00
2010-08-17 11:47:40 +02:00
2011-01-07 14:31:01 +01:00
2011-05-19 16:55:27 +09:30
2010-10-28 00:59:56 +02:00
2011-04-04 14:58:33 +02:00
2010-03-07 21:39:33 +01:00
2011-05-16 15:05:06 -04:00
2012-01-25 17:24:50 -08:00
2011-05-16 15:05:06 -04:00
2012-03-19 10:43:31 -07:00
2010-02-02 14:33:56 +01:00
2011-05-25 19:56:31 -04:00
2011-01-22 15:50:59 +01:00
2011-01-13 08:03:24 -08:00
a76e99abc5