git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 257ddbd b473946)

author	David S. Miller <davem@davemloft.net>
	Thu, 28 Jan 2010 14:12:38 +0000 (06:12 -0800)
committer	David S. Miller <davem@davemloft.net>
	Thu, 28 Jan 2010 14:12:38 +0000 (06:12 -0800)
commit	05ba712d7eb156009753e18e5116cabd869cc6e2
tree	1ad850d6889f6b3671a5636653940f20a7d22bdf	tree \| snapshot
parent	257ddbdad13cd3c4f7d03b85af632c508aa8abc9	commit \| diff
parent	b473946a0853860e13b51c28add5524741117786	commit \| diff

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

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.h	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	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/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igbvf/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/starfire.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/tulip_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/driver-trace.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.