Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 6 Dec 2008 06:54:40 +0000 (22:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 6 Dec 2008 06:54:40 +0000 (22:54 -0800)
commit730c30ec646bd252a9448a66ecd51d794853513f
treec0d413860f9d8bf37374f17cfabb4911143465d7
parent726e07a8a38168266ac95d87736f9501a2d9e7b2
parent0a0755c9fe47dc9f8271935909c66096e43efbfe
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
12 files changed:
drivers/isdn/hysdn/hysdn_net.c
drivers/net/bnx2.c
drivers/net/bnx2.h
drivers/net/enc28j60.c
drivers/net/netx-eth.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/zd1211rw/zd_mac.c
net/atm/svc.c
net/ipv4/tcp_output.c
net/mac80211/sta_info.c