alistair23-linux/arch/mn10300
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
..
boot MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
configs kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
include/asm MN10300: atomic_read() should ensure it emits a load 2011-03-14 14:51:25 +00:00
kernel mn10300: Switch do_timer() to xtimer_update() 2011-02-09 16:17:24 +01:00
lib MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
mm MN10300: The SMP_ICACHE_INV_FLUSH_RANGE IPI command does not exist 2011-03-14 14:45:29 +00:00
oprofile MN10300: Kill MN10300's own profiling Kconfig 2009-04-09 10:53:16 -07:00
proc-mn2ws0050 MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
proc-mn103e010 MN10300: Change "Matsushita" to "Panasonic". 2010-10-27 17:29:00 +01:00
unit-asb2303 MN10300: Generic time support 2010-10-27 17:28:57 +01:00
unit-asb2305 MN10300: Generic time support 2010-10-27 17:28:57 +01:00
unit-asb2364 MN10300: ASB2364: Add support for SMSC911X and SMC911X 2010-10-27 17:28:58 +01:00
Kconfig mn10300: Use generic irq Kconfig 2011-01-21 11:55:33 +01:00
Kconfig.debug MN10300: Default config choice GDBSTUB_TTYSM0 should be GDBSTUB_ON_TTYSM0 2010-09-27 16:29:06 -07:00
Makefile MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00