Ok so I'm going to merge this now, with the exception of patch 9 which I'm not entirely happy with as posted.
johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
