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

Trivial merge