Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Dec 2008 01:56:23 +0000 (17:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Dec 2008 01:56:23 +0000 (17:56 -0800)
commit6332178d91ca1a9dbd99bd97cabbcf965d178e9f
treed98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f
parent908a7a16b852ffd618a9127be8d62432182d81b4
parent739840d529eb7505d3cbfe9d468bf1440c9a8e27
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/ppp_generic.c
drivers/net/bnx2.c
drivers/net/jme.h
drivers/net/phy/mdio_bus.c
drivers/net/ppp_generic.c
drivers/net/starfire.c
net/bluetooth/rfcomm/core.c
net/socket.c