黄涛 2caa51d22a Merge remote-tracking branch 'linux-2.6.32.y/master' into develop ...

Merge Linux 2.6.32.42
Conflicts:
	Makefile
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/p54/p54usb.c

2011-06-28 09:47:32 +08:00

..

clockevents.c

clockevents: Add missing include to pacify sparse

2010-01-28 15:00:24 -08:00

clocksource.c

Merge remote-tracking branch 'linux-2.6.32.y/master' into develop

2011-06-16 11:56:59 +08:00

jiffies.c

clocksource: Cleanup clocksource selection

2009-08-15 10:55:46 +02:00

Kconfig

Kconfig: eliminate "def_bool n" constructs

2008-10-16 11:21:31 -07:00

Makefile

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

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

ntp.c

timekeeping: Introduce timekeeping_leap_insert

2009-08-15 10:55:45 +02:00

tick-broadcast.c

tick: Clear broadcast active bit when switching to oneshot

2011-05-23 11:20:19 -07:00

tick-common.c

clockevents: Prevent oneshot mode when broadcast device is periodic

2011-03-07 15:17:54 -08:00

tick-internal.h

clockevents: Prevent oneshot mode when broadcast device is periodic

2011-03-07 15:17:54 -08:00

tick-oneshot.c

clocksource: prevent selection of low resolution clocksourse also for nohz=on

2009-06-13 12:00:26 +02:00

tick-sched.c

nohz: Reuse ktime in sub-functions of tick_check_idle.

2010-08-13 13:20:13 -07:00

timecompare.c

timecompare: generic infrastructure to map between two time bases

2009-02-15 22:43:32 -08: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

time: Compensate for rounding on odd-frequency clocksources

2011-06-23 15:24:09 -07:00

timer_list.c

hrtimer: Tune hrtimer_interrupt hang logic

2010-04-01 15:58:14 -07:00

timer_stats.c

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00