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
..
calibrate.c	init: check printed flag to skip printing message	2012-03-23 16:58:38 -07:00
do_mounts.c	init: don't try mounting device as nfs root unless type fully matches	2012-05-05 10:04:40 -07:00
do_mounts.h
do_mounts_initrd.c	get rid of pointless includes of ext2_fs.h	2012-03-31 16:03:15 -04:00
do_mounts_md.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
do_mounts_rd.c	new helper: ext2_image_size()	2012-03-31 16:03:16 -04:00
init_task.c	init_task: Create generic init_task instance	2012-05-05 13:00:21 +02:00
initramfs.c	init/initramfs.c: should use umode_t	2012-01-03 22:55:14 -05: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
main.c	Driver core pull for 3.5-rc1	2012-05-22 16:02:13 -07:00
Makefile	init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK	2012-05-05 13:00:46 +02:00
noinitramfs.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
version.c	userns: add a user_namespace as creator/owner of uts_namespace	2011-03-23 19:46:59 -07:00