Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild
commit5cdddecc8b423308798453484149297a503e9cc0
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:53:07 +0000 (17 09:53 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 17:53:07 +0000 (17 09:53 -0800)
tree671a6a2ade9904bf99437104fd71f609be780737
parentac0b50dd10ac0d30f2732eec0587f3632c2be725
parent971edcfc8bee41c0b41e21bf10751c5b22028a82
Merge git://git./linux/kernel/git/sam/fix-kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild:
  kbuild: re-enable Makefile generation in a new O=... directory