From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 21 Aug 2013 13:19:36 +0000 (+0100)
Subject: Merge branch 'sfc-3.11'
X-Git-Tag: firefly_0821_release~176^2~5420^2~104^2~79
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=abc71bb939e3a789cc33ed46029bdff498bdc3a5;p=firefly-linux-kernel-4.4.55.git

Merge branch 'sfc-3.11'

Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.
---

abc71bb939e3a789cc33ed46029bdff498bdc3a5