From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 4 Aug 2006 18:57:43 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: firefly_0821_release~33637^2~38^2~58
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b9411014e6f18a883c18b38f41338dbd53fddea;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream-fixes' into upstream
---

8b9411014e6f18a883c18b38f41338dbd53fddea