Merge git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Thu, 3 Nov 2005 06:04:08 +0000 (17:04 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 3 Nov 2005 06:04:08 +0000 (17:04 +1100)

Trivial merge