Merge branch 'linus' into x86/timers
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:57 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:57 +0000 (11:20 +0200)
commitfd2c17e1777d46cff14c25ea774a4d17459d188a
treee8299216de8e99418195ba64bcf8f679df3a66b3
parent74e411cb6443d8bcb55fbe89fcc7a9ee574df91b
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into x86/timers
arch/x86/kernel/tsc_32.c
arch/x86/kernel/tsc_64.c