Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
commitf563d53c30f3e60cde3a194cc1a87284ee0b3366
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 16 Oct 2007 23:51:11 +0000 (16 16:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 16 Oct 2007 23:51:11 +0000 (16 16:51 -0700)
treec8696dc933093d54b2c36c85364761fafd85d3a0
parentce4b61f5e2fab568f90adf79642cbfc49aac5bba
parent7eebb9348655b55553d65fc7cb6cfad292d28dbb
Merge ssh:///pub/scm/linux/kernel/git/sam/kbuild

* ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  x86: fix boot error introduced by kbuild