git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
01ec65c
132bd96
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Tue, 9 Jun 2015 05:22:26 +0000
(07:22 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Tue, 9 Jun 2015 05:22:26 +0000
(07:22 +0200)
Resolve the non-trivial conflict due to the hdac regmap API changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff