Merge branch 'linus' into xen-64bit
authorIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:57:20 +0000 (23:57 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:57:20 +0000 (23:57 +0200)
commit393d81aa026e19b6ede6f5f11955c97ee62e5df5
treea1d9511e488e19d41089ff0a736f6ce52a81c6e5
parent93a0886e2368eafb9df5e2021fb185195cee88b2
parent5b664cb235e97afbf34db9c4d77f08ebd725335e
Merge branch 'linus' into xen-64bit
arch/x86/kernel/setup.c