Merge branch 'for-3.1' into for-3.2

Browse Source

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

parent 4b8713fd54 b5c49d49b9

commit 6010c4c6c8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available