Linus Torvalds c7523a7c88 Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull timer updates from Thomas Gleixner. Various trivial conflict fixups in arch Kconfig due to addition of unrelated entries nearby. And one slightly more subtle one for sparc32 (new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas. * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits) timekeeping: Fix a few minor newline issues. time: remove obsolete declaration ntp: Fix a stale comment and a few stray newlines. ntp: Correct TAI offset during leap second timers: Fixup the Kconfig consolidation fallout x86: Use generic time config unicore32: Use generic time config um: Use generic time config tile: Use generic time config sparc: Use: generic time config sh: Use generic time config score: Use generic time config s390: Use generic time config openrisc: Use generic time config powerpc: Use generic time config mn10300: Use generic time config mips: Use generic time config microblaze: Use generic time config m68k: Use generic time config m32r: Use generic time config ...		2012-05-24 13:29:46 -07:00
..
boot	MN10300: And Panasonic AM34 subarch and implement SMP	2010-10-27 17:28:55 +01:00
configs	cgroup: remove the ns_cgroup	2011-05-26 17:12:34 -07:00
include/asm	Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-23 10:59:07 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-05-23 18:11:45 -07:00
lib	Disintegrate asm/system.h for MN10300	2012-03-28 18:30:02 +01:00
mm	Disintegrate asm/system.h for MN10300	2012-03-28 18:30:02 +01:00
oprofile	MN10300: Kill MN10300's own profiling Kconfig	2009-04-09 10:53:16 -07:00
proc-mn2ws0050	Disintegrate asm/system.h for MN10300	2012-03-28 18:30:02 +01:00
proc-mn103e010	MN10300: Create general kernel debugger cache flushing	2011-03-18 16:54:30 +00:00
unit-asb2303	MN10300: Generic time support	2010-10-27 17:28:57 +01:00
unit-asb2305	mn10300/PCI: get rid of device resource fixups	2012-02-23 20:19:02 -07:00
unit-asb2364	mn10300: Convert genirq namespace	2011-03-29 14:48:18 +02:00
Kconfig	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Kconfig.debug	MN10300: Deprecate gdbstub	2011-03-18 16:54:32 +00:00
Makefile	mn10300: Use generic init_task	2012-05-05 13:00:24 +02:00