From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 2 Aug 2007 21:07:57 +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-rc2~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=628506c8de058f94297dae1f8ef8caaea29c4369;p=~emulex%2Finfiniband.git

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] Document grub < 0.93 as broken
  [x86 setup] EDD: add missing =m constraint
  [x86 setup] video setup: Fix VBE DDC reading
---

628506c8de058f94297dae1f8ef8caaea29c4369