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
..
2008-12-04 09:17:15 -08:00
2010-10-15 15:53:27 +02:00
2008-12-04 09:17:12 -08:00
2008-12-04 09:17:21 -08:00
2011-01-03 20:02:06 -07:00
2010-07-24 09:58:22 -06:00
2010-10-09 02:33:34 -06:00
2010-07-24 09:58:22 -06:00
2008-12-04 09:17:21 -08:00
2010-07-24 09:58:22 -06:00
2008-12-04 09:17:21 -08:00
2011-01-09 15:36:46 -08:00
2010-03-30 22:02:32 +09:00
2009-06-16 04:56:28 -07:00
2010-10-09 02:33:34 -06:00
2009-08-10 09:35:00 +02:00
2009-06-16 04:56:22 -07:00
2008-12-04 09:17:21 -08:00
2008-12-04 09:17:21 -08:00
2008-12-04 09:17:21 -08:00
2010-03-03 08:08:49 -08:00
2009-12-11 00:44:47 -08:00
2008-12-04 09:17:20 -08:00
2008-12-04 09:17:21 -08:00
2008-12-04 09:17:21 -08:00
2010-04-12 22:37:26 -07:00
2008-12-04 09:17:21 -08:00
2011-01-04 19:25:04 -08:00
2009-06-16 04:56:11 -07:00
2010-08-08 22:07:36 -07:00
2010-03-30 22:02:32 +09:00
2008-12-04 09:17:21 -08:00
2008-12-04 09:17:21 -08:00
2009-08-17 18:32:10 -07:00
2009-09-21 06:27:08 +02:00
2008-12-04 09:17:21 -08:00
2011-02-08 22:52:54 -08:00
2010-07-24 09:58:22 -06:00
2010-10-26 09:25:54 -07:00
2010-04-14 02:04:29 -07:00
2008-09-19 21:17:59 -07:00
2008-12-04 09:17:21 -08:00
2008-12-04 09:17:21 -08:00
2010-09-22 16:35:09 -04:00
2009-01-28 17:27:14 -08:00
2010-05-20 21:04:19 -05:00
2010-05-20 21:04:19 -05:00
2010-03-30 22:02:32 +09:00
2010-04-14 02:04:29 -07:00
2009-09-28 14:39:58 -07:00
2009-12-16 07:20:19 -08:00
2010-03-30 22:02:32 +09:00
2011-01-04 11:16:37 -08:00
2010-11-17 08:59:32 -08:00
2010-09-22 16:35:09 -04:00
2010-10-15 15:53:27 +02:00
2008-12-04 09:17:21 -08:00
2011-01-13 17:32:34 -08:00
2009-01-02 19:32:59 -08:00
2010-11-26 15:14:56 +01:00
2010-07-24 09:58:22 -06:00
2010-07-24 09:58:22 -06:00
2010-07-24 09:58:22 -06:00
2009-06-16 04:56:49 -07:00
2010-05-18 16:10:44 -06:00
2010-07-24 09:58:22 -06:00
2010-07-24 09:58:22 -06:00
2010-10-12 16:53:34 +02:00
2010-07-24 09:58:22 -06:00
2010-07-24 09:58:22 -06:00
2010-07-24 09:58:22 -06:00
2008-12-04 09:17:21 -08:00
2010-07-24 09:58:22 -06:00
2008-12-04 09:17:21 -08:00
2010-07-24 09:58:22 -06:00
2011-01-31 14:55:46 +01:00
2011-02-15 15:04:07 -08:00
2010-12-16 11:36:43 +01:00
2010-07-24 09:58:22 -06:00
2010-07-24 09:58:22 -06:00
2010-08-17 18:07:43 -07:00
2010-08-28 13:55:31 -07:00
2011-01-04 11:16:37 -08:00
2010-07-24 09:49:13 -06:00
2010-10-12 21:57:53 -06:00
2010-07-24 09:58:22 -06:00
2010-10-10 21:53:30 -06:00
2010-07-24 09:58:22 -06:00
2010-07-24 09:58:22 -06:00
2010-10-27 18:03:12 -07:00
2010-10-27 18:03:12 -07:00
2008-12-04 09:17:21 -08:00
2010-10-26 08:59:55 -07:00
2010-10-26 08:59:55 -07:00
2010-07-24 09:58:22 -06:00
2011-01-04 19:25:03 -08:00
2010-10-09 02:33:34 -06:00
2010-09-21 22:30:13 -07:00
2010-09-21 22:30:13 -07:00
2010-09-21 22:30:13 -07:00
2009-11-02 04:19:42 -08:00
2011-02-15 15:04:07 -08:00
2009-01-08 16:59:01 -08:00
2009-12-15 16:28:13 +10:30
2008-12-04 09:17:21 -08:00
2008-12-04 09:17:21 -08:00
2010-04-21 03:08:11 -07:00
2011-01-03 20:02:06 -07:00
2010-03-30 22:02:32 +09:00
2010-06-04 16:17:37 -07:00
2010-02-12 12:08:51 -08:00
2010-03-30 22:02:32 +09:00
2009-08-18 23:44:08 -07:00
2008-12-04 09:17:21 -08:00
2008-12-04 09:17:21 -08:00
2010-08-16 15:04:29 -07:00
2010-11-17 08:59:32 -08:00
2010-11-17 08:59:32 -08:00
2010-08-17 18:07:43 -07:00
2010-03-03 08:08:49 -08:00
2010-03-27 21:11:56 -07:00
2010-08-16 15:04:29 -07:00
2010-08-16 15:04:29 -07:00
2010-03-12 15:52:32 -08:00
2010-10-09 02:33:34 -06:00
2008-09-19 21:18:01 -07:00
2011-01-31 14:55:46 +01:00
2010-07-24 09:58:22 -06:00
2009-11-02 04:19:42 -08:00
2008-12-04 09:17:21 -08:00
2009-07-12 12:22:34 -07:00
2010-11-01 15:38:34 -04:00
2010-02-19 15:19:52 -08:00
2010-06-25 11:17:57 -07:00
2011-02-01 12:39:59 -08:00
2008-12-04 09:17:21 -08:00
2010-11-17 08:59:32 -08:00
2010-04-19 13:46:48 -07:00
2010-03-27 21:11:56 -07:00
2010-03-27 21:11:56 -07:00
2008-12-04 09:17:21 -08:00
2010-03-30 22:02:32 +09:00
2009-01-06 12:46:46 -08:00
2009-12-11 01:07:53 -08:00
2010-04-12 23:46:17 -07:00
2010-11-17 08:59:32 -08:00
2008-12-04 09:17:21 -08:00
2008-07-17 21:37:46 -07:00
2008-07-17 21:37:46 -07:00