Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jun 2008 18:21:47 +0000 (11:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jun 2008 18:21:47 +0000 (11:21 -0700)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  xen: remove support for non-PAE 32-bit


Trivial merge