Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 30 Nov 2007 00:25:29 +0000 (16:25 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 30 Nov 2007 00:25:29 +0000 (16:25 -0800)
commite1cca7e8d484390169777b423a7fe46c7021fec1
tree5f92e8cd2fd33fdcf03344c16c31b1069265cd91
parent2e824ad59f678a1ff920144fda9b7dd0815fc010
parent16252da654800461e0e1c32697cb59f4cda15aa9
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: don't recalculate ss:esp unless really necessary