From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 9 Aug 2012 13:11:17 +0000 (+0100)
Subject: Merge branches 'for-3.6' and 'for-3.7' into asoc-next
X-Git-Tag: next-20120816~50^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d42e8d2860366d22c9aa092ae458e75770ffdf88;p=karo-tx-linux.git

Merge branches 'for-3.6' and 'for-3.7' into asoc-next
---

d42e8d2860366d22c9aa092ae458e75770ffdf88