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
..
asm-offsets.c
break.S
cmode.S
debug-stub.c
dma.c
entry-table.S
entry.S
frv_ksyms.c
futex.c	futex: Sanitize futex ops argument types	2011-03-11 12:23:31 +01:00
gdb-io.c	frv: extend gdbstub to support more features of gdb	2010-05-25 08:07:02 -07:00
gdb-io.h
gdb-stub.c	FRV: Reinstate null behaviour for the GDB remote protocol 'p' command	2010-06-09 12:42:44 -07:00
head-mmu-fr451.S
head-uc-fr401.S
head-uc-fr451.S
head-uc-fr555.S
head.inc
head.S
init_task.c
irq-mb93091.c
irq-mb93093.c
irq-mb93493.c
irq.c
kernel_execve.S
kernel_thread.S
local64.h	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
local.h
Makefile
module.c
pm-mb93093.c
pm.c
process.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
ptrace.c	ptrace: cleanup arch_ptrace() on frv	2010-10-27 18:03:10 -07:00
setup.c
signal.c	frv: double syscall restarts, syscall restart in sigreturn()	2010-09-20 10:44:38 -07:00
sleep.S
switch_to.S
sys_frv.c
sysctl.c	frv: remove "struct file *" argument from sysctl ->proc_handler	2010-05-27 09:12:56 -07:00
time.c	frv: Switch do_timer() to xtime_update()	2011-01-31 14:55:45 +01:00
traps.c
uaccess.c
vmlinux.lds.S