Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work