Merge branch 'linus' into x86/timers
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)
commitf6477cc76c73833a56e97f1fafc36a7ca92927e5
tree9b4ca3d9fa63ea001d516834c8b2707094f3f711
parentfd2c17e1777d46cff14c25ea774a4d17459d188a
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into x86/timers
arch/x86/kernel/tsc_32.c