Merge branch 'for-3.1' into for-3.2

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

This commit is contained in:

Mark Brown

2011-10-02 20:20:35 +01:00

Родитель 4b8713fd54 b5c49d49b9

Коммит 6010c4c6c8