projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b21a415 0cc62e9)
Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Aug 2011 13:48:19 +0000 (22:48 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Aug 2011 13:48:19 +0000 (22:48 +0900)
Remove the bodge for ad193x.

Conflicts:
sound/soc/soc-io.c


Trivial merge
Domain: System / Kernel;