diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 17:05:47 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 17:06:24 +0200 |
commit | 4152f93508b184a85a975810b2cc3dc5c597cf57 (patch) | |
tree | 19dff39aa185f18ed662ab5802d1e873aea5ab44 /arch/ia64/kernel/dma-mapping.c | |
parent | Merge branch 'x86/paravirt' into x86/cleanups (diff) | |
parent | init: Move sched_clock_init after late_time_init (diff) | |
download | linux-4152f93508b184a85a975810b2cc3dc5c597cf57.tar.xz linux-4152f93508b184a85a975810b2cc3dc5c597cf57.zip |
Merge branch 'sched/clock' into x86/cleanups
Reason: The tsc init cleanup depends on sched_clock_init moving past
late_time_init.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/ia64/kernel/dma-mapping.c')
0 files changed, 0 insertions, 0 deletions