Merge branch 'linus' into x86/kconfig
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:54 +0000 (12:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:30:54 +0000 (12:30 +0200)
commit0ed368c71aa65cba8d349432bd4dab4a9a2eb39c
tree7746534bafd57f6764bda8f26efc3929a4acf914
parent7aaaec38fcd9ef3172e69f8c19f20113830a8498
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into x86/kconfig
arch/x86/Kconfig