linux-stable/kernel/time
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
2009-11-18 22:19:03 -08:00
..
clockevents.c clockevent: Prevent dead lock on clockevents_lock 2009-08-19 18:15:10 +02:00
clocksource.c clocksource/timecompare: Fix symbol exports to be GPL'd. 2009-11-11 19:06:30 -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 clockevent: Prevent dead lock on clockevents_lock 2009-08-19 18:15:10 +02:00
tick-common.c clockevents: prevent endless loop in tick_handle_periodic() 2009-05-02 10:22:27 +02:00
tick-internal.h NOHZ: restart tick device from irq_enter() 2008-10-17 18:13:38 +02: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: update idle state also when NOHZ is inactive 2009-10-07 13:05:05 +02:00
timecompare.c clocksource/timecompare: Fix symbol exports to be GPL'd. 2009-11-11 19:06:30 -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 headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
timer_list.c const: constify remaining file_operations 2009-10-01 16:11:11 -07:00
timer_stats.c const: constify remaining file_operations 2009-10-01 16:11:11 -07:00