git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
70a3887
8b99aba
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Mon, 15 Jun 2015 11:15:48 +0000
(13:15 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 15 Jun 2015 11:15:48 +0000
(13:15 +0200)
Conflicts:
sound/pci/hda/patch_realtek.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Trivial merge