Learn more about cloning repositories
You have read-only access
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: net/mac80211/scan.c net/mac80211/wme.c
