]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e869cf7 a2c665b)
Merge mars.ravnborg.org:/home/sam/bk/linux-2.6
authorSam Ravnborg <sam@mars.ravnborg.org>
Tue, 24 Aug 2004 23:23:46 +0000 (01:23 +0200)
committerSam Ravnborg <sam@mars.ravnborg.org>
Tue, 24 Aug 2004 23:23:46 +0000 (01:23 +0200)
into mars.ravnborg.org:/home/sam/bk/kbuild

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
Linux kernels and configurations used by Zygo.