]> git.hungrycats.org Git - linux/commitdiff
Merge samba.org:/home/paulus/kernel/linux-2.5
authorPaul Mackerras <paulus@samba.org>
Mon, 22 Sep 2003 17:51:18 +0000 (03:51 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 22 Sep 2003 17:51:18 +0000 (03:51 +1000)
into samba.org:/home/paulus/kernel/for-linus-ppc

1  2 
include/asm-ppc/processor.h

Simple merge