From: Vinod Koul <vinod.koul@linux.intel.com>
Date: Wed, 25 Apr 2012 09:58:54 +0000 (+0530)
Subject: Merge branch 'fixes' into next
X-Git-Tag: v3.5-rc1~80^2~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=56cbb3dd48623c01e7c589d29da743d486c95a58;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'fixes' into next
---

56cbb3dd48623c01e7c589d29da743d486c95a58