From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Thu, 14 Jun 2012 05:50:31 +0000 (+0530)
Subject: Merge branch 'fixes' into next
X-Git-Tag: v3.6-rc1~109^2~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0a0760358cbe922ba7440389ddae649bc56221ef;p=linux.git

Merge branch 'fixes' into next
---

0a0760358cbe922ba7440389ddae649bc56221ef