黄涛 21158e22d9 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Conflicts:
	Makefile
	drivers/mmc/core/sd.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2400pci.h
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2500usb.h
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt61pci.h
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/net/wireless/rt2x00/rt73usb.h
	drivers/net/wireless/rtl818x/rtl8187/dev.c
	drivers/usb/serial/option.c
	kernel/time/timekeeping.c

2012-10-08 10:28:29 +08: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 STA_INS/DEL clearing bug

2012-08-01 12:26:53 -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

nohz: Fix stale jiffies update in tick_nohz_restart()

2012-04-22 16:21:25 -07:00

timecompare.c

time: Use ARRAY_SIZE macro in timecompare.c

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

timeconv.c

time: add function to convert between calendar time and broken-down time for universal use

2009-09-24 07:20:56 -07:00

timekeeping.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-10-08 10:28:29 +08: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