Merge git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 02:08:55 +0000 (13:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 02:08:55 +0000 (13:08 +1100)

Trivial merge