From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 03:43:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20120430~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b731601100a57586450908a43a27908587c2c77;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	sound/soc/imx/Kconfig
---

9b731601100a57586450908a43a27908587c2c77