Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 24 Aug 2007 23:10:56 +0000 (16:10 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 24 Aug 2007 23:10:56 +0000 (16:10 -0700)
commit37a3cc99d5048df62bb201c0b45a51ba94497e45
treec129d5d04fc4eab5c8bc39fbf2203121be4d6d52
parent6e106b0d97e79f1abb60cc49a53af760950c3384
parent71351b98b9be6a867aa00276d67716c0728cfff7
Merge branch 'for-linus' of git://git./linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [x86 setup] Make sure AH=00h when setting a video mode
  [x86 setup] Volatilize asm() statements