Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Oct 2010 19:39:28 +0000 (15:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Oct 2010 19:39:28 +0000 (15:39 -0400)
commite9a68707d736f4f73d7e209885d7b4c5c452b1dc
treed9f76964c77c1059483b08436ed060b702b8e25d
parentdd53df265b1ee7a1fbbc76bb62c3bec2383bbd44
parent15a6321d1c0f8db561932cd99e1b9897981da71f
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ipw2x00/ipw2200.c
12 files changed:
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800lib.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/wl12xx/wl1271_scan.c
net/mac80211/main.c
net/wireless/core.h