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
..
firewire
perf	Merge branch 'Linux 3.0.21' into msm-3.0	2012-03-30 00:09:34 -07:00
power/x86	Merge branch 'master' into for-next	2011-04-26 10:22:59 +02:00
slub
testing/ktest	ktest: Ignore unset values of the minconfig in config_bisect	2011-06-02 11:57:57 -04:00
usb	USB: ffs-test: fix header path	2011-02-28 19:27:12 -08:00
virtio	virtio_test: support event index	2011-05-30 11:14:15 +09:30