Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Sep 2007 07:42:41 +0000 (00:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Sep 2007 07:42:41 +0000 (00:42 -0700)

Trivial merge