Merge branch 'for-3.1' into for-3.2 · git-mirror/linux@6010c4c · GitHub

Commit

Merge branch 'for-3.1' into for-3.2

Browse files

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

Loading branch information

Mark Brown committed Oct 2, 2011

2 parents 4b8713f + b5c49d4 commit 6010c4c