git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3818c9 c2dbab3)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2012 16:08:36 +0000 (09:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2012 16:08:36 +0000 (09:08 -0700)
Ben Hutchings says:

====================
1. Fix potential badness when running a self-test with SR-IOV enabled.
2. Fix calculation of some interface statistics that could run backward.
3. Miscellaneous cleanup.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
drivers/net/ethernet/sfc/net_driver.h patch | diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/rx.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/ethernet/sfc/net_driver.h
Simple merge
diff --cc drivers/net/ethernet/sfc/rx.c
Simple merge
Pandora Kernel Repository