Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2009 12:04:16 +0000 (05:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2009 12:04:16 +0000 (05:04 -0700)
commitd5df2a16133f4eb22f9a6bbc07723443568d362f
tree7135c9054db234feec6001c6d938a715b29e2370
parentd4a4aba61731ce6d102a6a93e22b8fa26511c9d5
parentdb434ac6bff0d991d0b60166dc9d6405b873d0f7
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bnx2x_main.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/p54/p54common.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt73usb.c
net/wireless/reg.c