1fafd85d3a0
parent ce4b61f5e2fab568f90adf79642cbfc49aac5bba
parent 7eebb9348655b55553d65fc7cb6cfad292d28dbb
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192578671 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192578671 -0700

Merge ssh://master.kernel.org/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
��