projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25c7d49 68214d9)
Merge branch 'omap-for-v3.8/cleanup-headers-asoc' into omap-for-v3.8/cleanup-headers
authorTony Lindgren <tony@atomide.com>
Thu, 18 Oct 2012 22:56:57 +0000 (15:56 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 18 Oct 2012 22:56:57 +0000 (15:56 -0700)
1  2 
sound/soc/omap/omap-abe-twl6040.c patch | diff1 | diff2 | blob | history
sound/soc/omap/omap-mcpdm.c patch | diff1 | diff2 | blob | history

diff --cc sound/soc/omap/omap-abe-twl6040.c
Simple merge
diff --cc sound/soc/omap/omap-mcpdm.c
Simple merge
Domain: System / Uncategorized;