Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Nov 2009 23:01:29 +0000 (15:01 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Nov 2009 23:01:29 +0000 (15:01 -0800)
commit4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905
tree0789ba36d96dba330416a1e6a9a68e891a78802a
parent35700212b45ea9f98fa682cfc1bc1a67c9ccc34b
parent18b6c9a2213d3b6e0212e8b225abf95f7564206a
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
net/wireless/core.c