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	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-03-30 18:15:43 -07:00
configs	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
include/asm	fork: move the real prepare_to_copy() users to arch_dup_task_struct()	2012-05-16 15:16:26 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next	2012-03-30 12:10:03 +02:00
mm	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
oprofile	microblaze: Core oprofile configs and hooks	2009-12-14 08:45:07 +01:00
pci	microblaze/PCI: fix "io_offset undeclared" error	2012-05-15 17:03:25 -06:00
platform	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Kconfig.debug	microblaze: remove obsolete DEBUG_BOOTMEM	2011-01-10 09:29:51 +01:00
Makefile	Fix common misspellings	2011-03-31 11:26:23 -03:00