git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 97767a8 413708b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 1 Mar 2012 22:57:40 +0000 (17:57 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Mar 2012 22:57:40 +0000 (17:57 -0500)
commitb4017c5368f992fb8fb3a2545a0977082c6664e4
treeb18fee77164297141c988965a9846225f8d8b3d3tree
parent97767a87f3be8834192dc3fc9412aaccf708d87fcommit | diff
parent413708bbaf5c85c4c8a264145f7d6c3afcd97f99commit | 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>
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
Unnamed repository; edit this file 'description' to name the repository.