From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Fri, 11 May 2012 06:24:34 +0000 (+0530)
Subject: Merge branch 'fixes' into next
X-Git-Tag: firefly_0821_release~3680^2~2758^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0d68ad197b1a4c93b9991faafa23df6d496f7c67;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' into next
---

0d68ad197b1a4c93b9991faafa23df6d496f7c67