Merge branch 'upstream' into bcm43xx