Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 4 Oct 2006 05:02:27 +0000 (15:02 +1000)

Trivial merge