Merge madwifi-dfs to trunk : r3109