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
2012-03-30 00:09:34 -07:00
2011-03-17 18:16:12 +08:00
2011-03-17 23:06:29 +08:00
2011-12-09 08:52:24 -08:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-01-06 22:33:32 +00:00
2011-04-24 19:16:09 +02:00
2011-05-12 08:36:53 +01:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-08-04 21:58:33 -07:00
2011-04-24 19:16:09 +02:00
2011-03-16 16:32:47 +08:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-02-09 23:05:03 +08:00
2011-12-09 08:52:24 -08:00
2011-03-26 10:03:03 +00:00
2011-03-21 09:09:33 +00:00
2011-03-26 10:03:03 +00:00
2011-03-26 10:03:03 +00:00
2011-03-16 16:32:48 +08:00
2011-03-26 10:03:03 +00:00
2011-01-15 00:14:25 +00:00
2011-04-24 19:16:09 +02:00
2011-12-09 08:52:24 -08:00
2011-05-20 22:27:34 +01:00
2011-01-07 17:08:46 -08:00
2011-03-16 16:32:47 +08:00
2011-12-29 13:52:38 +05:30
2011-05-25 02:20:48 +01:00
2011-03-26 10:03:03 +00:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-05-20 22:27:34 +01:00
2011-04-24 19:16:09 +02:00
2011-07-06 23:47:40 +08:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-03-21 09:09:33 +00:00
2011-12-09 08:52:24 -08:00
2011-04-24 19:16:09 +02:00
2011-12-09 08:52:24 -08:00
2011-03-16 16:32:47 +08:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-01-07 17:08:46 -08:00
2011-03-30 07:50:45 -07:00
Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel
2011-03-16 23:35:17 +00:00
2011-03-26 10:03:03 +00:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-07-11 14:26:33 +08:00
2011-03-26 10:03:03 +00:00
2011-03-21 09:09:33 +00:00
2011-01-13 10:05:56 -08:00
2011-02-22 17:11:24 +00:00
2011-04-24 19:16:09 +02:00
2011-06-16 08:40:44 -06:00
2011-03-26 10:03:03 +00:00
2011-03-21 09:09:33 +00:00
2011-03-21 09:09:33 +00:00
2011-03-16 16:32:47 +08:00
2011-05-23 18:04:51 +01:00
2011-02-27 21:38:18 +08:00
2011-03-26 10:03:03 +00:00
2011-04-24 19:16:09 +02:00
2011-04-24 19:16:09 +02:00
2011-12-09 08:52:24 -08:00
2011-03-21 09:09:33 +00:00
2011-03-26 10:03:03 +00:00
2011-03-30 07:50:45 -07:00
2011-03-21 09:09:33 +00:00
2011-03-16 16:32:47 +08:00
a76e99abc5