Merge branch 'x86/setup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tip...
authorIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:32:58 +0000 (23:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Jul 2008 21:32:58 +0000 (23:32 +0200)

Trivial merge