Linus Torvalds 420c1c572d Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits) posix-clocks: Check write permissions in posix syscalls hrtimer: Remove empty hrtimer_init_hres_timer() hrtimer: Update hrtimer->state documentation hrtimer: Update base[CLOCK_BOOTTIME].offset correctly timers: Export CLOCK_BOOTTIME via the posix timers interface timers: Add CLOCK_BOOTTIME hrtimer base time: Extend get_xtime_and_monotonic_offset() to also return sleep time: Introduce get_monotonic_boottime and ktime_get_boottime hrtimers: extend hrtimer base code to handle more then 2 clockids ntp: Remove redundant and incorrect parameter check mn10300: Switch do_timer() to xtimer_update() posix clocks: Introduce dynamic clocks posix-timers: Cleanup namespace posix-timers: Add support for fd based clocks x86: Add clock_adjtime for x86 posix-timers: Introduce a syscall for clock tuning. time: Splitout compat timex accessors ntp: Add ADJ_SETOFFSET mode bit time: Introduce timekeeping_inject_offset posix-timer: Update comment ... Fix up new system-call-related conflicts in arch/x86/ia32/ia32entry.S arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/syscall_table_32.S (name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some due to movement of get_jiffies_64() in: kernel/time.c		2011-03-15 18:53:35 -07:00
..
amiga	m68k/amiga: Fix "debug=mem"	2011-01-23 11:24:42 +01:00
apollo
atari	m68k/atari: Rename "scc" to "atari_scc"	2011-01-23 11:24:35 +01:00
bvme6000	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
fpsp040
hp300	m68k: hp300 - Checkpatch cleanup	2010-05-17 21:15:40 +02:00
ifpsp060	m68k: fix comment typo diable -> disable.	2011-01-03 16:06:58 +01:00
include/asm	m68knommu: add optimize memmove() function	2011-02-16 09:43:16 +10:00
kernel	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
lib	m68k: remove arch specific non-optimized memcmp()	2011-02-16 09:42:24 +10:00
mac	fix comment typos concerning "consistent"	2010-12-10 16:04:28 +01:00
math-emu
mm	m68k: invoke oom-killer from page fault	2010-05-17 21:37:39 +02:00
mvme16x	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
mvme147	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
q40	Update broken web addresses in arch directory.	2010-10-18 11:03:21 +02:00
sun3	m68k: Switch do_timer() to xtime_update()	2011-01-31 14:55:46 +01:00
sun3x	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
tools/amiga
install.sh
Kconfig	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
Kconfig.debug
Makefile	kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line	2010-08-03 14:09:45 +02:00