From: Len Brown <len.brown@intel.com>
Date: Sun, 15 Aug 2010 03:55:44 +0000 (-0400)
Subject: Merge branch 'nvs' into release
X-Git-Tag: firefly_0821_release~9833^2~736^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2a66185bed21427d8d347a42eaf0ad1d3d9fc63;p=firefly-linux-kernel-4.4.55.git

Merge branch 'nvs' into release
---

f2a66185bed21427d8d347a42eaf0ad1d3d9fc63