]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30cd324 7e3cbc3)
Merge branch 'x86/tsc' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 11:48:18 +0000 (12:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 11:48:18 +0000 (12:48 +0100)
commita3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
tree28eedba6d432e9d9d772962e6f92732aef1be065tree | snapshot
parent30cd324e9787ccc9a5ede59742d5409857550692commit | diff
parent7e3cbc3f774f31ecd88a51edae3d9377f60a4c00commit | diff
Merge branch 'x86/tsc' into tracing/core

Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:

Conflicts:
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/cpu/intel.c diff1 | diff2 | blob | history
arch/x86/kernel/process.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.