Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
authorDavid S. Miller <davem@davemloft.net>
Sat, 21 Sep 2013 18:20:08 +0000 (14:20 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Sep 2013 18:20:08 +0000 (14:20 -0400)
Ben Hutchings says:

====================
Daniel Pieczko fixed two bugs in reset handling that particularly
affected the new SFC9120 controller.
====================

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

Trivial merge