diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:10 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:10 +0200 |
commit | 28f73e51d0f64a5b896ad816ab8df6f3bcec5810 (patch) | |
tree | 8c51ad5ff74d6ef5d1d68121c9f9aadce836736e /net/llc | |
parent | x86: use cpu_khz for loops_per_jiffy calculation, cleanup (diff) | |
parent | Linux 2.6.26-rc8 (diff) | |
download | linux-28f73e51d0f64a5b896ad816ab8df6f3bcec5810.tar.xz linux-28f73e51d0f64a5b896ad816ab8df6f3bcec5810.zip |
Merge branch 'linus' into x86/delay
Conflicts:
arch/x86/kernel/tsc_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/llc')
0 files changed, 0 insertions, 0 deletions