From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 2 Oct 2011 19:20:35 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6010c4c6c8e60bece2d71173c96400bcd0aae792;p=linux-beck.git

Merge branch 'for-3.1' into for-3.2

Conflicts:
	sound/soc/omap/mcpdm.c
	sound/soc/omap/mcpdm.h
---

6010c4c6c8e60bece2d71173c96400bcd0aae792