-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6John W. Linville authored
Conflicts: net/mac80211/iface.c
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6John W. Linville authoredConflicts: net/mac80211/iface.c