Files
ubports_kernel_google_msm/include/linux
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 47916be4e2 ("Merge branch
'powerpc.cherry-picks' into timers/clocksource")
2010-08-06 13:18:29 -07:00
..
2010-07-31 14:20:02 +01:00
2010-08-02 15:03:21 -03:00
2010-05-28 01:38:00 +02:00
2010-08-05 13:26:20 +01:00
2010-06-04 16:00:42 -04:00
2010-06-15 09:56:01 +10:00
2010-05-27 09:12:53 -07:00
2010-05-19 13:38:54 -04:00
2010-06-24 21:30:09 -07:00
2010-05-19 22:41:57 -04:00
2010-05-10 16:08:01 -07:00
2010-08-04 11:00:45 +02:00
2010-05-17 16:30:58 -07:00
2010-05-21 19:30:44 +02:00
2010-08-05 09:22:31 -05:00
2010-05-25 08:07:01 -07:00
2010-05-27 09:12:42 -07:00
2010-05-21 09:34:29 -07:00
2010-07-19 11:54:16 +02:00
2010-06-16 18:08:13 +02:00
2010-06-03 03:21:52 -07:00
2010-06-03 03:21:52 -07:00
2010-06-03 03:21:52 -07:00
2010-06-03 03:21:52 -07:00
2010-06-03 03:21:52 -07:00
2010-06-23 13:16:38 -07:00
2010-05-11 12:01:10 -07:00
2010-06-22 08:07:01 +02:00
2010-07-19 22:01:26 -07:00
2010-06-03 03:21:52 -07:00
2010-05-21 09:37:29 -07:00
2010-05-14 15:09:32 -04:00
2010-08-02 06:39:44 +03:00
2010-08-01 10:47:00 +03:00
2010-06-29 10:38:22 -07:00
2010-06-16 18:03:15 +02:00
2010-07-14 17:14:00 +10:00
2010-06-03 03:21:52 -07:00
2010-05-11 14:40:55 +02:00
2010-06-03 03:21:52 -07:00
2010-06-03 03:21:52 -07:00
2010-05-17 05:27:42 +02:00
2010-06-03 03:21:52 -07:00
2010-07-02 21:59:08 -07:00
2010-07-05 16:14:52 -06:00
2010-07-05 16:14:25 -06:00
2010-07-24 09:58:22 -06:00
2010-07-31 19:53:06 +08:00
2010-07-30 09:29:35 -07:00
2010-06-03 03:21:52 -07:00
2010-07-19 01:58:48 +02:00
2010-07-19 01:58:48 +02:00
2010-06-03 03:21:52 -07:00
2010-07-19 11:02:51 +02:00
2010-05-27 09:12:50 -07:00
2010-05-30 09:02:47 -07:00
2010-05-11 10:09:47 +02:00
2010-07-22 13:46:21 -07:00
2010-06-03 03:21:52 -07:00
2010-05-25 11:41:43 -04:00
2010-08-03 00:31:48 -07:00
2010-06-16 14:55:35 -07:00
2010-05-10 11:08:35 -07:00
2010-05-27 09:12:43 -07:00
2010-07-21 21:43:06 +02:00
2010-05-15 23:28:39 -07:00
2010-05-12 23:02:23 -07:00
2010-06-29 10:44:29 +02:00
2010-05-19 22:40:47 -04:00
2010-08-02 10:37:17 -05:00
2010-05-19 22:15:46 +09:30
2010-06-03 03:21:52 -07:00