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)
commit54399a78c95f1be0ae9bf6587cbddbfc641aab9c
tree19b942f2f76ac87a508df1161091b088fcb616ad
parentd3818c92afabecfe6b8e5d2e3734c8753522987c
parentc2dbab39db1c3c2ccbdbb2c6bac6f07cc7a7c1f6
Merge branch 'for-davem' of git://git./linux/kernel/git/bwh/sfc-next

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>
drivers/net/ethernet/sfc/net_driver.h
drivers/net/ethernet/sfc/rx.c