Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:53:07 +0000 (09:53 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:53:07 +0000 (09:53 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild:
  kbuild: re-enable Makefile generation in a new O=... directory


Trivial merge