]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3adda8 a2c665b)
Merge bk://linux-sam.bkbits.net/kbuild
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 Aug 2004 06:48:16 +0000 (23:48 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 23 Aug 2004 06:48:16 +0000 (23:48 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history
arch/arm/kernel/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/kernel/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.