]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9bac55b46ad01979e57605e63123619679358b63
tree9f3215138783d7a6cfd341e51495c1c2a725cfb4
parent44bf7ee1af4d6f72decc39baa1721f4a21be9e87
parent8d3c83c69eab50a9cc2e2a08080ec55cd44f0841
Merge git://git.kernel.org/pub/scm/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