Merge branch 'linus' into x86/cleanups
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:53:16 +0000 (13:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 11:53:16 +0000 (13:53 +0200)
commitcdbfc557c43ea1f1f9b7062300ecb1254969814b
tree255f1cf62cea2c3dec208799a00a116e714a6128
parent4d8cc874d7ed43eda72765e9c0e141e170fee4f3
parent5b664cb235e97afbf34db9c4d77f08ebd725335e
Merge branch 'linus' into x86/cleanups
arch/x86/kernel/process.c
arch/x86/kernel/smpboot.c