From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 28 Sep 2007 18:24:20 +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-rc9~23
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=ae000eec2c6aa785e1a85bea6e2f612fb826859a;hp=-c

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] Correct the SMAP check for INT 0x15, AX=0xe820
---

ae000eec2c6aa785e1a85bea6e2f612fb826859a