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
..
amiga	m68k/amiga: Use arch_initcall() for registering platform devices	2012-04-22 20:16:48 +02:00
apollo
atari	m68k/atari: Change VME irq numbers from unsigned long to unsigned int	2012-04-22 20:16:49 +02:00
bvme6000
configs	m68k: add a defconfig for the M5475EVB ColdFire with MMU board	2012-05-20 21:23:05 +10:00
emu
fpsp040
hp300
ifpsp060
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	m68k: add TIF_NOTIFY_RESUME and handle it.	2012-05-21 23:59:47 -04:00
lib
mac	m68k/mac: Add missing platform check before registering platform devices	2012-04-01 22:57:51 +02:00
math-emu
mm	m68k/mm: Port OOM changes to do_page_fault()	2012-04-22 20:16:49 +02:00
mvme16x
mvme147
platform	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-05-23 18:11:45 -07:00
q40	m68k/q40: Add missing platform check before registering platform devices	2012-04-01 22:57:53 +02:00
sun3
sun3x
tools/amiga
install.sh
Kconfig	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Kconfig.bus
Kconfig.cpu	Fix typo in various Kconfig file	2012-04-16 14:40:08 +02:00
Kconfig.debug
Kconfig.devices
Kconfig.machine
Makefile	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2012-05-21 19:15:03 -07:00