Merge git://oak/home/sfr/kernels/iseries/work/
authorPaul Mackerras <paulus@samba.org>
Fri, 28 Oct 2005 03:50:39 +0000 (13:50 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 28 Oct 2005 03:50:39 +0000 (13:50 +1000)

Trivial merge