Merge samba.org:/home/paulus/kernel/linux-2.5
authorPaul Mackerras <paulus@samba.org>
Fri, 10 May 2002 01:42:52 +0000 (11:42 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 10 May 2002 01:42:52 +0000 (11:42 +1000)
commitbb3ffc11438abe20c39265cf83c9e01340c6970b
treed79f62fd923b0483a15a24ad2da8cc38403ba1d8
parent63a1a4651f8ea037308bdf3760ce6ac870f767a6
parent4ce6b618012e4649b858bf2884f7fa060aee692b
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc