Merge /spare/repo/netdev-2.6/ branch 'ieee80211'