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
..
drivers	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-05-23 09:01:41 -07:00
include	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
os-Linux	um: Remove unused variables	2012-05-21 21:09:32 +02:00
scripts	um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS	2012-03-25 00:29:56 +01:00
sys-ia64
sys-ppc
.gitignore
defconfig	um: Remove CONFIG_IRQ_RELEASE_METHOD	2012-05-21 21:09:37 +02:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-24 13:29:46 -07:00
Kconfig.debug
Kconfig.net
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Makefile	um: Switch to large mcmodel on x86_64	2012-03-25 00:29:57 +01:00
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas