]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-sam.bkbits.net/kbuild
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 10 Sep 2004 16:16:30 +0000 (09:16 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 10 Sep 2004 16:16:30 +0000 (09:16 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
arch/arm/Makefile
arch/ppc/Makefile
init/Kconfig

Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge