From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 May 2006 18:45:29 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: firefly_0821_release~35492^2~23^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01d654d25d23fb73deb7904ce1c0b3a0f5fc2908;p=firefly-linux-kernel-4.4.55.git

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

01d654d25d23fb73deb7904ce1c0b3a0f5fc2908