| commit | da7add323d1e00e867e4e8ef51789acdd1d749cd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Sep 21 14:20:08 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Sep 21 14:20:08 2013 -0400 |
| tree | c51eec74029ef7ad1a1b9811200caac82801b4f1 | |
| parent | 87397fe10db0e7ee85041eee5a40052cab66aaff [diff] | |
| parent | b2d32f03e67cc9b0ad16fc1fff87edf90f059883 [diff] |
Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc 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>