From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 25 Oct 2012 16:36:02 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/fix/ux500' and 'asoc/fix/wm8994' into for-3.7
X-Git-Tag: v3.7-rc3~17^2^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=456ba5a7802e58eccb5aa9751b3ab515ef99b9ca;p=users%2Fhch%2Fblock.git

Merge remote-tracking branches 'asoc/fix/ux500' and 'asoc/fix/wm8994' into for-3.7
---

456ba5a7802e58eccb5aa9751b3ab515ef99b9ca