Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Sep 2007 21:35:55 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Sep 2007 21:35:55 +0000 (14:35 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [x86 setup] Work around bug in Xen HVM


Trivial merge