brcm47xx: now hopfully realy commit the right things from r22385