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: 8ed8e9f 63ba421)

author	David S. Miller <davem@davemloft.net>
	Tue, 21 Apr 2009 08:32:26 +0000 (01:32 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 21 Apr 2009 08:32:26 +0000 (01:32 -0700)
commit	1bfe45dd5e1f65abb72ea93dd9316d29fe9ee5e6
tree	db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb	tree \| snapshot
parent	8ed8e9f8fe4f8e2cf2827b2a9b22f0020fec7e80	commit \| diff
parent	63ba4215bca004951c37aecb4ffd6667ef232d29	commit \| diff

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

Conflicts:
net/core/dev.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/at76c50x-usb.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.