]> 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>
Fri, 24 Sep 2010 19:52:34 +0000 (15:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Sep 2010 19:52:34 +0000 (15:52 -0400)
commit068aefa61470906c790767765287cee496e10837
tree25d4df186cd631810ff15a8e7d37cb6cdd806cdb
parentcfb0d4e34bc25c49e008a0339d59077d7a44b4a7
parenta91c4d34b81bfba1f347b2c40e2c0c821f469661
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/p54/txrx.c
net/mac80211/main.c
net/mac80211/rx.c
net/wireless/core.c
net/wireless/wext-core.c