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

…

Kconfig

tick: Document TICK_ONESHOT config option

2012-03-31 12:45:43 +02:00

Makefile

…

ntp.c

time: remove no_sync_cmos_clock

2012-03-23 16:25:20 -07:00

posix-clock.c

…

tick-broadcast.c

tick: Fix the spurious broadcast timer ticks after resume

2012-04-19 21:27:50 +02:00

tick-common.c

…

tick-internal.h

…

tick-oneshot.c

…

tick-sched.c

nohz: Fix stale jiffies update in tick_nohz_restart()

2012-04-06 13:24:17 +02:00

timecompare.c

…

timeconv.c

…

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_stats.c

…