From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 22 Aug 2012 19:21:29 +0000 (+0100)
Subject: Merge branch 'for-3.7' into asoc-next
X-Git-Tag: next-20120823~53^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0fc363cf740a59d7197bcb5de938a336e222e5f2;p=karo-tx-linux.git

Merge branch 'for-3.7' into asoc-next

Conflicts:
	sound/soc/omap/am3517evm.c
---

0fc363cf740a59d7197bcb5de938a336e222e5f2