Commit 6010c4c6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2 

Conflicts:
	sound/soc/omap/mcpdm.c
	sound/soc/omap/mcpdm.h
parents 4b8713fd b5c49d49

There are no changes