git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63faf15
7b0692f
)
Merge branch 'for-3.12/sensor-hub' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Fri, 6 Sep 2013 09:59:53 +0000
(11:59 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Fri, 6 Sep 2013 09:59:53 +0000
(11:59 +0200)
Conflicts:
drivers/hid/hid-sensor-hub.c
Trivial merge