From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 26 Sep 2012 18:21:46 +0000 (+0100)
Subject: Merge branches 'for-3.6' and 'for-3.7' into asoc-next
X-Git-Tag: next-20120927~60^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a1327ebf76a88d1c00068316ad35edf608a3a9cd;p=karo-tx-linux.git

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

a1327ebf76a88d1c00068316ad35edf608a3a9cd