tree f7ceda585fa4f0d7954d704b9ddebd982985963e
parent 2165f631f0e1d4e9a1ee425ef05cb727352285e0
parent cc65f1ec192dc54de57483194502e9fa00934c39
author Linus Torvalds <torvalds@linux-foundation.org> 1223147686 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1223147686 -0700

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86 setup: correct segfault in generation of 32-bit reloc kernel