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