Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Nov 2009 19:38:16 +0000 (11:38 -0800)
commit2071a0084a0323697b7d6fd5a98982194bd6929f
treecfa228cd187f600fd93b858b46e656bb24b0020e
parentff879eb611dba859c4349048a32789e8c82afa91
parentd01032e4fd33110f9f3a085a36cb819c1dfc5827
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
MAINTAINERS
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/led.c
drivers/net/wireless/b43/main.c