git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 88230fd 0553c89)

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	e1943424e43974f85b82bb31eaf832823bf49ce7
tree	00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c	tree \| snapshot
parent	88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83	commit \| diff
parent	0553c891fabd287726b41076cfd03fe7e5ab596f	commit \| diff

Merge branch 'master' of /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

John Crispins staging tree