From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 24 Aug 2007 23:10:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux... 
X-Git-Tag: v2.6.23-rc4~18
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37a3cc99d5048df62bb201c0b45a51ba94497e45;p=linux-2.6

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

37a3cc99d5048df62bb201c0b45a51ba94497e45