]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcad42658b6d5a772edd4a7b5e31fa6acbc9abd8b
treed98af2cbc7ff0e9e4d00b6cc8c79b05ca7815a5f
parent1ff1be63e0a26621d204d63a50a6c88b7ac6ad11
parent02cc04ada53a71ba9f1688323a0cb46c7dfffef4
Merge branch 'master' of master.kernel.org:/pub/scm/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