Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:23:56 +0000 (15:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:23:56 +0000 (15:23 -0800)

Trivial merge