]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000 (10:28 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000 (10:28 -0400)
commit3fcb7718fc6ee48e860286acae75eae6800b655b
tree81af47abc50641f911e3b5833850357a48a82be8
parent140f3755059fa4cbcdf47eb16ababf5f96203dd6
parentefb0115fb2284ff81c32b42173044cab06c02f0b
Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c
net/wireless/nl80211.c
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/iwlegacy/iwl-core.c
drivers/net/wireless/iwlegacy/iwl3945-base.c
drivers/net/wireless/iwlegacy/iwl4965-base.c
net/wireless/nl80211.c