atheros: merge a few patches into the right place