Backport patches from r24162 brcm47xx: reorder patches like they were commitet upstream SVN-Revision: 24266