Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 26 Oct 2007 20:56:01 +0000 (13:56 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 26 Oct 2007 20:56:01 +0000 (13:56 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  x86 setup: sizeof() is unsigned, unbreak comparisons
  x86 setup: handle boot loaders which set up the stack incorrectly


Trivial merge