Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 19 Nov 2008 07:38:23 +0000 (23:38 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Nov 2008 07:38:23 +0000 (23:38 -0800)
commit198d6ba4d7f48c94f990f4604f0b3d73925e0ded
tree56bbdf8ba2553c23c8099da9344a8f1d1aba97ab
parent9a57f7fabd383920585ed8b74eacd117c6551f2d
parent7f0f598a0069d1ab072375965a4b69137233169c
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
31 files changed:
MAINTAINERS
drivers/infiniband/hw/nes/nes.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/isdn/i4l/isdn_net.c
drivers/net/atlx/atl1.c
drivers/net/bnx2.c
drivers/net/cxgb3/cxgb3_main.c
drivers/net/e100.c
drivers/net/e1000/e1000_main.c
drivers/net/e1000e/netdev.c
drivers/net/gianfar.c
drivers/net/igb/igb_ethtool.c
drivers/net/igb/igb_main.c
drivers/net/mlx4/mlx4_en.h
drivers/net/myri10ge/myri10ge.c
drivers/net/niu.c
drivers/net/phy/mdio_bus.c
drivers/net/phy/phy_device.c
drivers/net/qla3xxx.c
drivers/net/smc911x.c
drivers/net/via-velocity.c
drivers/net/wireless/hostap/hostap_wlan.h
drivers/net/wireless/rtl8187_dev.c
fs/cifs/cifs_spnego.c
fs/cifs/connect.c
include/linux/kernel.h
include/net/sock.h
net/core/sock.c
net/ipv4/ip_input.c
net/mac80211/mlme.c
net/phonet/af_phonet.c