Merge branch 'x86/setup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into x86/setup
