| commit | 28f73e51d0f64a5b896ad816ab8df6f3bcec5810 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Wed, 25 Jun 2008 10:30:10 +0000 (25 12:30 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Wed, 25 Jun 2008 10:30:10 +0000 (25 12:30 +0200) | ||
| tree | 8c51ad5ff74d6ef5d1d68121c9f9aadce836736e | treesnapshot (tar.gz zip) |
| parent | f3f3149f35b9195ef4b761b1353fc0766b5f53be | commitdiff |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 | commitdiff |
Merge branch 'linus' into x86/delay
Conflicts:
arch/x86/kernel/tsc_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Conflicts:
arch/x86/kernel/tsc_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| arch/x86/kernel/tsc_32.c | diff1 | diff2 | blobhistory |