From: Len Brown <len.brown@intel.com>
Date: Wed, 20 Jan 2010 06:23:18 +0000 (-0500)
Subject: Merge branch 'osc-bugfix' into release
X-Git-Tag: firefly_0821_release~9833^2~3319^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4cdd6ac4f9b73118542a5c4e796e6b9f287d0dd;p=firefly-linux-kernel-4.4.55.git

Merge branch 'osc-bugfix' into release
---

b4cdd6ac4f9b73118542a5c4e796e6b9f287d0dd