]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linux-sam.bkbits.net/kbuild
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 31 Mar 2004 03:15:07 +0000 (19:15 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 31 Mar 2004 03:15:07 +0000 (19:15 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
Makefile

diff --cc Makefile
Simple merge