Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 22:46:49 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 22:46:49 +0000 (15:46 -0700)

Trivial merge