Merge git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Mon, 14 Nov 2005 06:15:45 +0000 (17:15 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 14 Nov 2005 06:15:45 +0000 (17:15 +1100)

Trivial merge