Merge git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 04:14:44 +0000 (15:14 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 04:14:44 +0000 (15:14 +1100)

Trivial merge