git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d5471e6
e4d9e51
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Fri, 4 Jul 2014 05:48:57 +0000
(07:48 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Fri, 4 Jul 2014 05:48:57 +0000
(07:48 +0200)
Conflicts:
sound/pci/hda/hda_intel.c
Trivial merge