kernel_optimize_test/arch/m68knommu/kernel
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
..
.gitignore m68knommu: .gitignore vmlinux.lds 2010-10-21 10:17:30 +10:00
asm-offsets.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2010-10-25 07:44:27 -07:00
dma.c 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
entry.S m68knommu: Switch to saner sigsuspend 2011-01-07 14:06:59 +01:00
init_task.c Use new __init_task_data macro in arch init_task.c files. 2009-09-21 06:27:08 +02:00
irq.c m68knommu: remove the common interrupt controller structure 2009-09-16 09:43:46 +10:00
m68k_ksyms.c
Makefile m68knommu: remove the obsolete and long unused comempci chip support 2009-01-27 16:42:02 +10:00
module.c module: cleanup FIXME comments about trimming exception table entries. 2009-06-12 21:47:05 +09:30
process.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
ptrace.c ptrace: cleanup arch_ptrace() on m68knommu 2010-10-27 18:03:11 -07:00
setup.c m68knommu: remove command line printing DEBUG 2011-01-05 15:19:17 +10:00
signal.c m68knommu: Need to check __get_user()/__put_user() result 2011-01-07 14:07:00 +01:00
sys_m68k.c Make do_execve() take a const filename pointer 2010-08-17 18:07:43 -07:00
syscalltable.S m68k,m68knommu: Wire up fanotify_init, fanotify_mark, and prlimit64 2010-09-13 20:28:45 +02:00
time.c m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
traps.c m68knommu: mask of vector bits in exception word properly 2010-10-21 10:17:31 +10:00
vmlinux.lds.S m68knommu: add missing linker __modver section 2011-02-16 09:43:17 +10:00