Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Dec 2010 21:37:55 +0000 (16:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Dec 2010 21:40:49 +0000 (16:40 -0500)
commit17b3c17ecde36db5db7760a2802990b3129a4d65
tree36f7c593ff1a8a0a8b9f8324248d760c2341ad12
parent1fcfe76a760e78d7774a254608557c84071b0cfb
parent65af8dea26aa89ae4a810bdaa05545a8e670b636
Merge branch 'wireless-next-2.6' of git://git./linux/kernel/git/iwlwifi/iwlwifi-2.6

Conflicts:
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-core.h