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

..

alarmtimer.c

alarmtimers: Fix time comparison

2011-12-21 12:57:34 -08:00

clockevents.c

Revert "clockevents: Set noop handler in clockevents_exchange_device()"

2012-01-03 10:42:00 -08:00

clocksource.c

clocksource: Fix bug with max_deferment margin calculation

2011-12-09 08:52:52 -08:00

jiffies.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

Kconfig

time: Kill off CONFIG_GENERIC_TIME

2010-07-27 12:40:54 +02:00

Makefile

HACK: time: Disable alarmtimer

2011-06-14 11:37:53 -07:00

ntp.c

ntp: fix non privileged system time shifting

2011-04-04 08:31:23 -07:00

posix-clock.c

posix clocks: Replace mutex with reader/writer semaphore

2011-04-18 10:39:38 +02:00

tick-broadcast.c

tick-broadcast: Stop active broadcast device when replacing it

2011-12-09 08:52:48 -08:00

tick-common.c

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-03-15 18:53:35 -07:00

tick-internal.h

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-03-15 18:53:35 -07:00

tick-oneshot.c

time: Make do_timer() and xtime_lock local to kernel/time/

2011-01-31 19:26:50 +01:00

tick-sched.c

tick-sched: change the cpu that updates rq_stats

2012-01-04 12:24:24 -08:00

timecompare.c

time: Use ARRAY_SIZE macro in timecompare.c

2010-10-21 17:30:06 +02:00

timeconv.c

…

timekeeping.c

Merge branch 'Linux 3.0.21' into msm-3.0

2012-03-30 00:09:34 -07:00

timer_list.c

timer debug: Hide kernel addresses via %pK in /proc/timer_list

2011-02-12 14:11:56 +01:00

timer_stats.c

Fix common misspellings

2011-03-31 11:26:23 -03:00