]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Fri, 4 Nov 2005 06:03:39 +0000 (17:03 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 4 Nov 2005 06:03:39 +0000 (17:03 +1100)

Trivial merge