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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b8bc042 5447080)

author	David S. Miller <davem@davemloft.net>
	Wed, 28 Jul 2010 04:01:35 +0000 (21:01 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 28 Jul 2010 04:01:35 +0000 (21:01 -0700)
commit	bb7e95c8fd859922c6cf3ebbb3a8546007df1748
tree	58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7	tree \| snapshot
parent	b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027	commit \| diff
parent	5447080cfa3c77154498dfbf225367ac85b4c2b5	commit \| diff

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

Conflicts:
drivers/net/bnx2x_main.c

Merge bnx2x bug fixes in by hand... :-/

Signed-off-by: David S. Miller <davem@davemloft.net>

15 files changed:

drivers/net/bnx2x/bnx2x.h	diff1 \|	\|	blob \| history
drivers/net/bnx2x/bnx2x_main.c	diff1 \|	\|	blob \| history
drivers/net/bnx2x/bnx2x_stats.c	diff1 \|	\|	blob \| history
drivers/net/bonding/bond_alb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvtap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/s2io.h	diff1 \|	diff2 \|	blob \| history
include/linux/if_macvlan.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree