git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1b15d2e
368c966
)
Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:01 +0000
(13:09 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:01 +0000
(13:09 +0200)
Conflicts:
drivers/hid/hid-sensor-hub.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff