git.maquefel.me Git - linux.git/commit

author	David S. Miller <davem@davemloft.net>
	Mon, 11 Apr 2011 20:44:25 +0000 (13:44 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 11 Apr 2011 20:44:25 +0000 (13:44 -0700)
commit	1c01a80cfec6f806246f31ff2680cd3639b30e67
tree	0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c	tree \| snapshot
parent	c44d79950b2daa1025e62eede73e4e4a274d1ef3	commit \| diff
parent	4a9f65f6304a00f6473e83b19c1e83caa1e42530	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/smsc911x.c

40 files changed:

drivers/isdn/mISDN/layer2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/atl1e/atl1e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/atlx/atl2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bcm63xx_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/cxgb4vf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ibmlana.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcnet32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/s2io.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/net_driver.h	diff1 \|	diff2 \|	blob \| history
drivers/net/skge.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smsc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tg3.h	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/smsc95xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-rhine.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-velocity.c	diff1 \|	diff2 \|	blob \| history
include/linux/ethtool.h	diff1 \|	diff2 \|	blob \| history
include/linux/pkt_sched.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_trie.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/isdn/mISDN/layer2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/atl1e/atl1e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/atlx/atl2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bcm63xx_enet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/cxgb4vf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ibmlana.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcnet32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/s2io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/s2io.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/net_driver.h	diff1 \|	diff2 \|	blob \| history
drivers/net/skge.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smsc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tg3.h	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/smsc95xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-rhine.c	diff1 \|	diff2 \|	blob \| history
drivers/net/via-velocity.c	diff1 \|	diff2 \|	blob \| history
include/linux/ethtool.h	diff1 \|	diff2 \|	blob \| history
include/linux/pkt_sched.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_trie.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history