]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Dec 2011 19:35:41 +0000 (14:35 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Dec 2011 19:35:41 +0000 (14:35 -0500)
commit7c88887cdf1aca61e3e21e7d746c0869f1acfb29
tree05220b08a0c9d170ad88e3b9ed0390750d22d8ea
parentb903ad51d22cb21ca62bcd6d8a2381dc2c181b28
parent3a7414a85d4cab9c939d072e0f5a895cd5a9a0ee
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-mac80211.c
drivers/ssb/driver_pcicore.c
net/mac80211/agg-tx.c
net/nfc/nci/core.c