Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ... This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-05-02 11:48:07 -07:00
..
alarmtimer.c	alarmtimer: Provide accessor to alarmtimer rtc device	2012-04-20 14:56:36 -07:00
clockevents.c	Revert "clockevents: Set noop handler in clockevents_exchange_device()"	2011-12-30 13:24:40 -08:00
clocksource.c	kernel-time: fix s/then/than/ spelling errors	2012-03-23 16:49:21 -07:00
jiffies.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig	tick: Document TICK_ONESHOT config option	2012-03-31 12:45:43 +02:00
Makefile	timers: Introduce in-kernel alarm-timer interface	2011-04-26 14:01:44 -07:00
ntp.c	time: remove no_sync_cmos_clock	2012-03-23 16:25:20 -07:00
posix-clock.c	kernel: Fix files explicitly needing EXPORT_SYMBOL infrastructure	2011-10-31 19:30:05 -04:00
tick-broadcast.c	tick: Fix the spurious broadcast timer ticks after resume	2012-04-19 21:27:50 +02:00
tick-common.c	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-internal.h	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-oneshot.c	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-sched.c	nohz: Fix stale jiffies update in tick_nohz_restart()	2012-04-06 13:24:17 +02: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 branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 14:16:48 -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	locking, timer_stats: Annotate table_lock as raw	2011-09-13 11:12:00 +02:00