Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 21:44:49 +0000 (13:44 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 21:44:49 +0000 (13:44 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild:
  kbuild: do not pick up CFLAGS from the environment


Trivial merge