]> git.hungrycats.org Git - linux/commitdiff
Merge foobazco.org:/sources/2.5-bk
authorKeith M. Wesolowski <wesolows@foobazco.org>
Sun, 21 Mar 2004 14:03:03 +0000 (06:03 -0800)
committerKeith M. Wesolowski <wesolows@foobazco.org>
Sun, 21 Mar 2004 14:03:03 +0000 (06:03 -0800)
into foobazco.org:/sources/2.5-sparc-smp

1  2 
arch/sparc/kernel/entry.S

Simple merge