Merge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr