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: f4314d5 418588d)

author	David S. Miller <davem@davemloft.net>
	Tue, 13 Oct 2009 19:55:20 +0000 (12:55 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 13 Oct 2009 19:55:20 +0000 (12:55 -0700)
commit	67fd4e116dab849e2cd9ac8fd7c7068eabf1df95
tree	fb814456af86c75e1eb9e330994dda461fc5b4f7	tree \| snapshot
parent	f4314d57fa4f503131798b29e30292af1cfdc6d9	commit \| diff
parent	418588d5dbae5c7eaafc81a4382fcc3e444661d7	commit \| diff

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

12 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethoc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixp2000/ixpdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cmdresp.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.