You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 ...		13 years ago
..
drivers	Merge branch 'master' of github.com:davem330/net	14 years ago
include	um: clean arch_ptrace() up a bit	14 years ago
kernel	um: clean arch_ptrace() up a bit	14 years ago
os-Linux	um: Save FPU registers between task switches	14 years ago
scripts	uml: throw out CONFIG_MODE_TT	18 years ago
sys-i386	um: clean arch_ptrace() up a bit	14 years ago
sys-ia64	uml: remove useless comments	16 years ago
sys-ppc	um: change to new flag variables	14 years ago
sys-x86_64	um: clean arch_ptrace() up a bit	14 years ago
.gitignore	um: tell git to ignore generated files	15 years ago
Kconfig.char	sound: make OSS sound core optional	17 years ago
Kconfig.common	genirq: Remove the now obsolete config options and select statements	14 years ago
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	14 years ago
Kconfig.net	Fix common misspellings	14 years ago
Kconfig.rest	uml: kill a kconfig warning	16 years ago
Kconfig.um	uml: fix hppfs build	14 years ago
Kconfig.x86	um: disable CMPXCHG_DOUBLE as it breaks UML build	14 years ago
Makefile	um: fix strrchr() problems	14 years ago
Makefile-i386	[UML] fix gcc ICEs and unresolved externs	17 years ago
Makefile-ia64	…
Makefile-os-Linux	x86, um: get rid of arch/um/os symlink	17 years ago
Makefile-ppc	…
Makefile-skas	…
Makefile-x86_64	[UML] fix gcc ICEs and unresolved externs	17 years ago
defconfig	time: Cleanup old CONFIG_GENERIC_TIME references that snuck in	14 years ago