Yocto Project Linux Firmware / linux-wandboard / 6010c4c6c8e

Commits

Mark Brown committed 6010c4c6c8eM02 Oct 2011

Merge branch 'for-3.1' into for-3.2

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

Showing diff to4b8713fd545