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
..
appldata	sched/accounting: Change cpustat fields to an array	2011-12-06 09:06:38 +01:00
boot	s390: add various .gitignore files.	2012-05-16 14:42:41 +02:00
crypto	Disintegrate asm/system.h for S390	2012-03-28 18:30:02 +01:00
hypfs	switch open-coded instances of d_make_root() to new helper	2012-03-20 21:29:35 -04:00
include/asm	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
kvm	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
lib	[S390] rework idle code	2012-03-11 11:59:28 -04:00
math-emu	s390: change to new flag variable	2011-03-17 14:02:57 +01:00
mm	s390/pfault: add sanity check	2012-05-16 14:42:43 +02:00
oprofile	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
defconfig	s390/crypto des: add missing select statement	2012-05-16 14:42:36 +02:00
Kbuild	[S390] make arch/s390 subdirectories depend on config option	2011-12-27 11:27:12 +01:00
Kconfig	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	[S390] Write protect module text and RO data	2011-03-15 17:08:23 +01:00
Makefile	s390: Use generic init_task	2012-05-05 13:00:25 +02:00