]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Jun 2011 17:53:32 +0000 (13:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Jun 2011 17:56:21 +0000 (13:56 -0400)
commit53b7f385bfd565b2ff13e6c8c7990903153dba40
tree0c5c4e509c37098671df55a20b7e9aadb3d74db8
parentef643c6960338c6a7b6d1d4281d17e903ca8ba30
parentfa90d0756e4d342a679503f476559bb9ebb81a01
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-2000.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/rtlwifi/pci.c
include/net/cfg80211.h
net/wireless/nl80211.c