Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
2069601b3f
linux/kernel/debug/kdb
History
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
..
.gitignore kdb: core for kgdb back end (1 of 2) 2010-05-20 21:04:20 -05:00
kdb_bp.c kdb: core for kgdb back end (1 of 2) 2010-05-20 21:04:20 -05:00
kdb_bt.c printk,kdb: capture printk() when in kdb shell 2010-05-20 21:04:27 -05:00
kdb_cmds kdb: core for kgdb back end (1 of 2) 2010-05-20 21:04:20 -05:00
kdb_debugger.c kgdb,8250,pl011: Return immediately from console poll 2010-05-20 21:04:22 -05:00
kdb_io.c printk,kdb: capture printk() when in kdb shell 2010-05-20 21:04:27 -05:00
kdb_keyboard.c kgdboc,keyboard: Keyboard driver for kdb with kgdb 2010-05-20 21:04:24 -05:00
kdb_main.c Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-08-06 13:18:29 -07:00
kdb_private.h vt,console,kdb: automatically set kdb LINES variable 2010-08-05 09:22:30 -05:00
kdb_support.c kdb: core for kgdb back end (1 of 2) 2010-05-20 21:04:20 -05:00
Makefile kgdboc,keyboard: Keyboard driver for kdb with kgdb 2010-05-20 21:04:24 -05:00