From: Len Brown <len.brown@intel.com>
Date: Wed, 16 Dec 2009 19:07:29 +0000 (-0500)
Subject: Merge branch 'osc' into release
X-Git-Tag: firefly_0821_release~9833^2~3627^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2900681b25d5a1a1a7b39ab66da3b8c6b1b0b7ad;p=firefly-linux-kernel-4.4.55.git

Merge branch 'osc' into release
---

2900681b25d5a1a1a7b39ab66da3b8c6b1b0b7ad