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)
commitb285e0b78464f9a15a5095ac1dd5458ee7938714
tree26076bcd4e26087bf7abc1a1c0d7053c4ae1c801
parentc11eef21aa119a41fa210b9693f2346997885bcf
parent69ee0b3522428a07ff1765446d631ecc7da6ae0f
Merge git://git./linux/kernel/git/sam/fix-kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild:
  kbuild: do not pick up CFLAGS from the environment