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
..
appldata	[S390] mm: add ZONE_DMA to 31-bit config again	2011-05-26 09:48:25 +02:00
boot	[S390] fix s390 assembler code alignments	2011-07-24 10:48:21 +02:00
crypto	crypto: s390 - support hardware accelerated SHA-224	2011-07-04 20:06:01 +08:00
hypfs	s390: Convert vmalloc/memset to vzalloc	2011-09-15 13:55:02 +02:00
include/asm	Merge branch 'master' of github.com:davem330/net	2011-10-07 13:38:43 -04:00
kernel	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
kvm	[S390] kvm: extension capability for new address space layout	2011-09-20 17:07:34 +02:00
lib	[S390] fix s390 assembler code alignments	2011-07-24 10:48:21 +02:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	[S390] gmap: always up mmap_sem properly	2011-09-26 16:40:50 +02:00
oprofile	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
defconfig	[S390] Update default configuration	2011-01-12 09:55:24 +01:00
Kbuild	[S390] standardize Kbuild rules	2010-10-25 16:10:14 +02:00
Kconfig	PM / Hibernate: Include storage keys in hibernation image on s390	2011-10-16 23:27:46 +02:00
Kconfig.debug	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	[S390] remove redundant stack check option	2011-03-15 17:08:22 +01:00