]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 May 2008 07:52:37 +0000 (00:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 May 2008 07:52:37 +0000 (00:52 -0700)
commit9d865ce52c6a588d5d43c1d48c04943f0747d86f
tree986ea7b54e9fc79a64863fd7e92eabd99ffd37a3
parent84bbfbcf736f4a72207995c67bcddd7845916219
parentb70ca4b9db5bc2f42a63ca82c62f2439425679d9
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
12 files changed:
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt61pci.c
net/mac80211/iface.c
net/mac80211/main.c
net/mac80211/mesh_hwmp.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/tx.c