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

projects / openwrt / staging / blogic.git / commit

author	David S. Miller <davem@davemloft.net>
	Thu, 1 Mar 2012 22:57:40 +0000 (17:57 -0500)
committer	David S. Miller <davem@davemloft.net>
	Thu, 1 Mar 2012 22:57:40 +0000 (17:57 -0500)
commit	b4017c5368f992fb8fb3a2545a0977082c6664e4
tree	b18fee77164297141c988965a9846225f8d8b3d3	tree \| snapshot
parent	97767a87f3be8834192dc3fc9412aaccf708d87f	commit \| diff
parent	413708bbaf5c85c4c8a264145f7d6c3afcd97f99	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/broadcom/tg3.c

Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.

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

John Crispins staging tree

RSS Atom

drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cisco/enic/enic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cisco/enic/enic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-sta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00dev.c	diff1 \|	diff2 \|	blob \| history
include/linux/tcp.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rate.c	diff1 \|	diff2 \|	blob \| history