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	Kbuild: centralize MKIMAGE and cmd_uimage definitions	2012-03-26 15:49:20 +02:00
configs	unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig)	2011-06-09 16:24:42 +08:00
include	fork: move the real prepare_to_copy() users to arch_dup_task_struct()	2012-05-16 15:16:26 -07:00
kernel	unicore32: if there's no handler we need to restore sigmask, syscall or no syscall	2012-05-22 00:01:09 -04:00
lib	unicore32: fix build error for find bitops	2011-11-15 17:13:14 +08:00
mm	Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-04-04 17:13:43 -07:00
.gitignore
Kconfig	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Kconfig.debug	unicore32: drop unused Kconfig symbols	2011-11-15 17:13:18 +08:00
Makefile	unicore32: Use generic init_task	2012-05-05 13:00:26 +02:00