Linus Torvalds
b62ad9ab18
Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
...
* 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
um: Fix read_persistent_clock fallout
kgdb: Do not access xtime directly
powerpc: Clean up obsolete code relating to decrementer and timebase
powerpc: Rework VDSO gettimeofday to prevent time going backwards
clocksource: Add __clocksource_updatefreq_hz/khz methods
x86: Convert common clocksources to use clocksource_register_hz/khz
timekeeping: Make xtime and wall_to_monotonic static
hrtimer: Cleanup direct access to wall_to_monotonic
um: Convert to use read_persistent_clock
timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
powerpc: Cleanup xtime usage
powerpc: Simplify update_vsyscall
time: Kill off CONFIG_GENERIC_TIME
time: Implement timespec_add
x86: Fix vtime/file timestamp inconsistencies
Trivial conflicts in Documentation/feature-removal-schedule.txt
Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as
per Thomas' earlier merge commit 47916be4e28c ("Merge branch
'powerpc.cherry-picks' into timers/clocksource")
2010-08-06 13:18:29 -07:00
..
2010-08-06 11:44:36 -07:00
2009-09-23 07:39:28 -07:00
2010-05-19 22:42:08 -04:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2009-09-24 07:20:57 -07:00
2010-04-23 02:09:52 +02:00
2010-08-05 08:45:20 -07:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2010-04-23 02:09:52 +02:00
2010-02-24 13:51:32 +01:00
2010-01-13 10:55:16 -05:00
2009-08-29 19:09:27 -07:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2010-08-06 11:36:30 -07:00
2010-02-05 12:22:34 +01:00
2010-08-04 15:31:02 -07:00
2010-03-06 11:26:32 -08:00
2010-08-04 15:21:40 +02:00
2010-08-06 11:44:36 -07:00
2010-08-05 13:53:34 -07:00
2010-08-06 10:02:58 -07:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2009-06-07 13:52:52 +02:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:31:02 -07:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:31:02 -07:00
2010-08-04 15:21:40 +02:00
2010-08-05 14:12:07 -07:00
2009-06-12 18:01:47 +02:00
2010-08-04 15:21:40 +02:00
2010-08-02 06:40:50 +03:00
2010-08-04 15:31:02 -07:00
2010-04-23 02:09:52 +02:00
2009-01-14 19:19:03 +01:00
2010-08-04 15:21:40 +02:00
2009-06-12 18:01:47 +02:00
2010-08-04 15:21:40 +02:00
2010-04-23 02:09:52 +02:00
2010-08-04 15:31:02 -07:00
2010-07-11 22:17:45 +02:00
2010-08-03 09:04:11 +02:00
2010-08-04 15:21:40 +02:00
2010-08-05 09:03:46 -07:00
2009-06-18 13:04:04 -07:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2010-04-02 20:12:01 +02:00
2010-08-04 15:31:02 -07:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2010-05-25 00:23:16 -06:00
2010-06-28 13:59:28 +02:00
2010-08-04 15:21:40 +02:00
2009-11-05 18:18:10 -05:00
2010-08-04 11:00:45 +02:00
2010-07-21 11:00:25 -04:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:21:40 +02:00
2010-08-04 15:31:02 -07:00
2010-08-05 13:21:23 -07:00
2010-08-04 15:21:40 +02:00
2010-07-01 16:02:55 +00:00
2010-02-15 14:34:18 -08:00
2010-08-04 15:21:40 +02:00
2010-04-08 11:34:34 +02:00
2010-07-20 17:49:30 +00:00
2010-08-02 15:35:15 +10:00
2010-04-23 02:09:52 +02:00
2010-08-04 15:21:40 +02:00
2009-06-12 18:01:47 +02:00
2009-08-22 14:25:32 -07:00
2010-07-20 17:49:30 +00:00
2010-04-23 02:09:52 +02:00
2010-07-11 21:55:42 +02:00
2010-03-24 16:31:22 -07:00
2010-06-29 15:27:00 +02:00
2009-06-12 18:01:46 +02:00
2009-12-17 11:43:29 +10:30
2009-10-30 14:59:52 -07:00
2010-07-29 15:16:18 -07:00
2009-10-03 09:28:11 +02:00
2009-06-12 18:01:50 +02:00
2010-08-04 15:21:40 +02:00
2010-05-27 09:12:53 -07:00
2010-03-12 15:52:43 -08:00
2010-02-25 14:43:57 -08:00
2009-03-24 16:38:27 -07:00
2010-05-10 11:49:30 -03:00
2010-02-05 12:22:39 +01:00
2010-03-12 15:52:35 -08:00
2010-08-06 13:18:29 -07:00
2009-10-15 07:25:20 -06:00
2009-05-09 07:12:50 +02:00
2009-09-21 15:14:56 +02:00
2010-03-06 11:26:48 -08:00
2010-08-04 15:21:40 +02:00
2010-03-06 11:26:29 -08:00
2010-08-04 15:21:40 +02:00
2009-09-19 09:37:23 -07:00
2010-03-12 15:52:39 -08:00
2010-01-11 09:34:07 -08:00
2010-08-04 15:21:40 +02:00
2010-08-06 13:18:29 -07:00
2009-09-02 21:29:22 +10:00
2009-07-01 22:36:22 +02:00
2009-09-08 16:36:08 +01:00
2010-03-19 07:12:20 -07:00
2010-08-05 13:26:30 +01:00
2009-09-18 09:48:52 -07:00
2010-08-04 15:21:40 +02:00
2009-08-28 15:21:12 -04:00
2009-06-23 20:21:38 +01:00
2009-06-12 18:01:47 +02:00
2009-08-07 12:03:46 +02:00
2009-12-06 13:20:02 +01:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2010-03-12 15:52:35 -08:00
2010-08-04 15:21:40 +02:00
2010-03-24 16:31:22 -07:00
2009-12-15 08:53:17 -08:00
2009-09-22 07:17:26 -07:00
2010-03-03 11:26:00 +01:00
2009-12-15 08:53:24 -08:00
2009-09-22 07:17:39 -07:00
2010-05-19 08:37:43 +01:00
2010-07-31 19:53:07 +08:00
2010-02-05 12:22:44 +01:00
2010-02-18 15:40:56 -08:00
2010-03-10 17:09:33 -05:00
2009-06-18 13:03:56 -07:00
2010-06-05 17:39:09 +02:00
2009-09-23 07:39:46 -07:00
2009-12-01 08:20:31 -08:00
2009-06-12 18:01:47 +02:00
2010-04-23 02:09:52 +02:00
2010-07-19 10:56:54 +02:00
2009-12-14 09:46:56 -08:00
2010-04-22 15:24:56 -07:00
2010-05-24 07:31:20 -07:00
2010-08-04 15:21:40 +02:00
2009-10-01 16:11:12 -07:00
2010-03-16 11:47:56 +01:00
2010-05-19 10:14:15 -07:00
2010-08-02 15:35:10 +10:00
2009-12-16 11:28:58 -08:00
2010-03-24 16:31:20 -07:00