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	m32r: fix arch/m32r/boot/compressed/Makefile	2009-11-09 09:00:50 +09:00
configs	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
include/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-05-23 18:11:45 -07:00
kernel	m32r: use set_current_blocked() and block_sigmask()	2012-05-21 23:52:36 -04:00
lib
mm	Disintegrate asm/system.h for M32R	2012-03-28 18:30:02 +01:00
oprofile
platforms	Disintegrate asm/system.h for M32R	2012-03-28 18:30:02 +01:00
Kconfig	m32r: Use generic time config	2012-05-21 11:01:42 +02:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	m32r: Use generic init_task	2012-05-05 13:00:23 +02:00