]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commitda7add323d1e00e867e4e8ef51789acdd1d749cd
treec51eec74029ef7ad1a1b9811200caac82801b4f1
parent87397fe10db0e7ee85041eee5a40052cab66aaff
parentb2d32f03e67cc9b0ad16fc1fff87edf90f059883
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>