git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
692af90
bf06848
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Thu, 11 Jun 2015 04:52:31 +0000
(06:52 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Thu, 11 Jun 2015 04:52:31 +0000
(06:52 +0200)
This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.
Conflicts:
sound/pci/hda/hda_intel.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff