Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Sep 2007 18:24:20 +0000 (11:24 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Sep 2007 18:24:20 +0000 (11:24 -0700)
commitae000eec2c6aa785e1a85bea6e2f612fb826859a
tree14ffaa202799aa1e2381a05f600c702a3c19f76b
parentcdfef17d93b35a6d583509945e699ee998abce24
parent4ee5b10abeb2b5581be10d3022694cd19084e9b0
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