projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
b21a415
0cc62e9
)
Merge branch 'for-3.1' into for-3.2
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 15 Aug 2011 13:48:19 +0000
(22:48 +0900)
committer
Mark 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