Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Sep 2008 19:23:41 +0000 (12:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Sep 2008 19:23:41 +0000 (12:23 -0700)
commit93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95
treece7e4e6056b575138777793520dded9cb3638056
parentea81e2722e55ba0269c92f266763e445dcffb973
parentd6be118a97ce51ca84035270f91c2bccecbfac5f
Merge branch 'x86-fixes-for-linus' of git://git./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: fix memmap=exactmap boot argument
  x86: disable static NOPLs on 32 bits
  xen: fix 2.6.27-rc5 xen balloon driver warnings