git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7ec75c5 e95ef5d)

author	David S. Miller <davem@davemloft.net>
	Tue, 27 Apr 2010 19:49:13 +0000 (12:49 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 27 Apr 2010 19:49:13 +0000 (12:49 -0700)
commit	e1703b36c358dde24ececba4fd609ecd91433ba3
tree	d59c333d0ad5bf72f165264eba6048c87fdc4e0f	tree \| snapshot
parent	7ec75c582e639d956ce3afd499f67febe6f902a4	commit \| diff
parent	e95ef5d3f6bc60433883e1ef65dac747acd0bf1a	commit \| diff

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

Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c

19 files changed:

drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/82571.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_82599.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ks8851.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tg3.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/inet6_connection_sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/xfrm6_policy.c	diff1 \|	diff2 \|	blob \| history
net/rds/rdma_transport.c	diff1 \|	diff2 \|	blob \| history
net/x25/af_x25.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree