Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Sep 2005 20:18:15 +0000 (13:18 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Sep 2005 20:18:15 +0000 (13:18 -0700)

Trivial merge