Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 06:43:03 +0000 (22:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2008 06:43:03 +0000 (22:43 -0800)
commit9eeda9abd1faf489f3df9a1f557975f4c8650363
tree3e0a58e25b776cfbee193195460324dccb1886c7
parent61c9eaf90081cbe6dc4f389e0056bff76eca19ec
parent4bab0ea1d42dd1927af9df6fbf0003fc00617c50
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
31 files changed:
MAINTAINERS
drivers/net/3c509.c
drivers/net/Kconfig
drivers/net/bnx2x_main.c
drivers/net/cris/eth_v10.c
drivers/net/fs_enet/fs_enet-main.c
drivers/net/irda/ks959-sir.c
drivers/net/irda/ksdazzle-sir.c
drivers/net/mv643xx_eth.c
drivers/net/niu.c
drivers/net/smc911x.c
drivers/net/smc91x.c
drivers/net/tun.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/zd1211rw/zd_usb.c
fs/cifs/connect.c
net/8021q/vlan_core.c
net/core/dev.c
net/core/skbuff.c
net/ipv4/tcp.c
net/ipv4/udp.c
net/ipv6/addrconf.c
net/ipv6/udp.c
net/rfkill/rfkill.c
net/socket.c
net/unix/af_unix.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_user.c
security/selinux/hooks.c