Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86