Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jan 2010 22:22:54 +0000 (17:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 6 Jan 2010 22:26:13 +0000 (17:26 -0500)
commitcfa6cb2048beb35ae7f1d2fa19160aab240557d1
tree9f3215138783d7a6cfd341e51495c1c2a725cfb4
parent8271195e38d01f3551bb10b1c7de856cd8507882
parent8a5b33f55452c226aa0e47d737e541985ff10e16
Merge git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
net/mac80211/scan.c
net/mac80211/wme.c
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/offchannel.c