From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 5 May 2006 20:56:24 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: firefly_0821_release~35492^2~23^2~28
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd5226a72694d1c0abe1cc39711a86f1754e637d;p=firefly-linux-kernel-4.4.55.git

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

fd5226a72694d1c0abe1cc39711a86f1754e637d