]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Dec 2010 21:33:28 +0000 (16:33 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Dec 2010 21:33:28 +0000 (16:33 -0500)
commit1fcfe76a760e78d7774a254608557c84071b0cfb
tree2659028625a15a6bcbef350d16ace21982f714d4
parent0c8173385e549f95cd80c3fff5aab87b4f881d8d
parent56e6417b49132d4f56e9f2241d31942b90b46315
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/p54/p54usb.c
net/bluetooth/rfcomm/core.c
net/mac80211/ibss.c
net/mac80211/work.c