Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds [Mon, 7 Nov 2005 00:59:14 +0000 (16:59 -0800)]

Trivial merge