Linus Torvalds 39adff5f69 Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits) time, s390: Get rid of compile warning dw_apb_timer: constify clocksource name time: Cleanup old CONFIG_GENERIC_TIME references that snuck in time: Change jiffies_to_clock_t() argument type to unsigned long alarmtimers: Fix error handling clocksource: Make watchdog reset lockless posix-cpu-timers: Cure SMP accounting oddities s390: Use direct ktime path for s390 clockevent device clockevents: Add direct ktime programming function clockevents: Make minimum delay adjustments configurable nohz: Remove "Switched to NOHz mode" debugging messages proc: Consider NO_HZ when printing idle and iowait times nohz: Make idle/iowait counter update conditional nohz: Fix update_ts_time_stat idle accounting cputime: Clean up cputime_to_usecs and usecs_to_cputime macros alarmtimers: Rework RTC device selection using class interface alarmtimers: Add try_to_cancel functionality alarmtimers: Add more refined alarm state tracking alarmtimers: Remove period from alarm structure alarmtimers: Remove interval cap limit hack ...		2011-10-26 17:15:03 +02:00
..
drivers	Merge branch 'master' of github.com:davem330/net	2011-09-22 03:23:13 -04:00
include	um: clean arch_ptrace() up a bit	2011-09-14 18:09:37 -07:00
kernel	um: clean arch_ptrace() up a bit	2011-09-14 18:09:37 -07:00
os-Linux	um: Save FPU registers between task switches	2011-09-14 18:09:37 -07:00
scripts
sys-i386	um: clean arch_ptrace() up a bit	2011-09-14 18:09:37 -07:00
sys-ia64
sys-ppc
sys-x86_64	um: clean arch_ptrace() up a bit	2011-09-14 18:09:37 -07:00
.gitignore
defconfig	time: Cleanup old CONFIG_GENERIC_TIME references that snuck in	2011-10-04 13:07:47 -07:00
Kconfig.char
Kconfig.common
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net
Kconfig.rest
Kconfig.um	uml: fix hppfs build	2011-04-28 11:28:21 -07:00
Kconfig.x86	um: disable CMPXCHG_DOUBLE as it breaks UML build	2011-09-14 18:09:37 -07:00
Makefile	um: fix strrchr() problems	2011-09-14 18:09:37 -07:00
Makefile-i386
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas
Makefile-x86_64