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: c10d826 26e6ee9)

author	David S. Miller <davem@davemloft.net>
	Tue, 19 Apr 2011 07:21:33 +0000 (00:21 -0700)
committer	David S. Miller <davem@davemloft.net>
	Tue, 19 Apr 2011 07:21:33 +0000 (00:21 -0700)
commit	60ef25b48107fcfa51b70db1bd10f675f42f874c
tree	00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c	tree \| snapshot
parent	c10d826ee6b08678e6abf1b4f952da3ae570eb33	commit \| diff
parent	26e6ee9adb1c648a235f7060eb6b2f39d22b23ea	commit \| diff

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

Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bna/bfa_ioc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bna/bnad.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlcnic/qlcnic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/efx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/net_driver.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/nic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_connection_sock.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.