From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Mon, 6 Aug 2012 05:16:37 +0000 (+0530)
Subject: Merge branch 'fixes_for-3.6' into fixes
X-Git-Tag: firefly_0821_release~3680^2~2060^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f986ffedd7c60c76e72d63dda49a0c705d451d43;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes_for-3.6' into fixes
---

f986ffedd7c60c76e72d63dda49a0c705d451d43