[ppc40x] merge 2.6.28 patches