Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7

Browse source

...

This commit is contained in:

Mark Brown 2012-10-04 18:57:34 +01:00

parent 07ac2296fb b764de2d8b

commit 68d114e1c6

4 changed files with 45 additions and 41 deletions

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

Download patch file Download diff file Expand all files Collapse all files

12

arch/arm/mach-omap1/board-ams-delta.c

View file

63

sound/soc/omap/ams-delta.c

View file

2

sound/soc/omap/omap-abe-twl6040.c

View file

9

sound/soc/omap/omap-mcpdm.c

View file