git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a32c99e
d1c7e29
7bb9d64
)
Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Fri, 12 Dec 2014 10:09:23 +0000
(11:09 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Fri, 12 Dec 2014 10:09:23 +0000
(11:09 +0100)
Conflicts:
drivers/hid/hid-input.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff