git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
49d776f
d1d0b6b
)
Merge branch 'for-linus' into for-next
author
Takashi Iwai
<tiwai@suse.de>
Mon, 27 Oct 2014 13:11:07 +0000
(14:11 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 27 Oct 2014 13:11:07 +0000
(14:11 +0100)
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).
Conflicts:
sound/firewire/bebob/bebob_focusrite.c
Trivial merge