From: David S. Miller Date: Sat, 21 Sep 2013 18:20:08 +0000 (-0400) Subject: Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc X-Git-Tag: firefly_0821_release~176^2~5211^2~56 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da7add323d1e00e867e4e8ef51789acdd1d749cd;p=firefly-linux-kernel-4.4.55.git Merge branch 'sfc-3.12' of git://git./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 --- da7add323d1e00e867e4e8ef51789acdd1d749cd