Merge branch 'linus' into x86/nmi
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:31:28 +0000 (12:31 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:31:28 +0000 (12:31 +0200)
commit8700600a74852d75eb965b969dcf9f58e2b32546
tree1490919076921ecc208bf667a8c2f8a7c5446854
parentb8e0418b2a25f975c3b8764030c24b7253d33a68
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into x86/nmi
arch/x86/kernel/Makefile