From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 6 Dec 2013 22:28:18 +0000 (+0000)
Subject: Merge branch 'sfc-3.13' into master
X-Git-Tag: firefly_0821_release~176^2~4570^2~497^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2dd6426597eb642197a0bdb13d096acb1164b958;p=firefly-linux-kernel-4.4.55.git

Merge branch 'sfc-3.13' into master

Merge sfc fixes destined for 3.13, as development for 3.14+ depends on
some of them.
---

2dd6426597eb642197a0bdb13d096acb1164b958