Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2008 18:31:24 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2008 18:31:24 +0000 (11:31 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus:
  kbuild: fix vmlinux.o link
  kconfig: made check-lxdialog more portable


Trivial merge