git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 288e57f 114623d)

author	David S. Miller <davem@davemloft.net>
	Wed, 8 Oct 2008 21:56:41 +0000 (14:56 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 8 Oct 2008 21:56:41 +0000 (14:56 -0700)
commit	4d3e4ac9e10c0e465c950c23c111f1855ce46e96
tree	e08910d2d0feae0c030f8f01acc9b03eb760ad9a	tree \| snapshot
parent	288e57f196353c0d99b88e001a1df98e6ac08a59	commit \| diff
parent	114623d638f3676937e4ffe5a231a2693db527e4	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/ich8lan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/param.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.