projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
18d4ed4
)
Merge branch 'for-3.1' into for-3.2
author
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 05:56:19 +0000
(14:56 +0900)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 8 Aug 2011 05:56:19 +0000
(14:56 +0900)
Conflict due to the fix for the register map failure - taken the for-3.1
version.
Conflicts:
sound/soc/codecs/sgtl5000.c
No differences found