Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:35:51 +0000 (00:35 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:35:51 +0000 (00:35 -0700)

Trivial merge