]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit - net/ax25
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Mar 2009 10:06:47 +0000 (02:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Mar 2009 10:06:47 +0000 (02:06 -0800)
commit508827ff0ac3981d420edac64a70de7f4e304d38
treeb0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5
parent2c3c3d02f28801d7ad2da4952b2c7ca6621ef221
parent72e2240f181871675d3a979766330c91d48a1673
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
16 files changed:
MAINTAINERS
drivers/net/arm/ks8695net.c
drivers/net/bonding/bond_main.c
drivers/net/fsl_pq_mdio.c
drivers/net/jme.c
drivers/net/sungem.c
drivers/net/tokenring/tmspci.c
include/linux/netdevice.h
net/802/tr.c
net/core/dev.c
net/ipv6/addrconf.c
net/ipv6/af_inet6.c
net/netlink/af_netlink.c
net/sctp/protocol.c
net/sctp/sm_sideeffect.c
net/sctp/sm_statefuns.c