git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05f6d02
b2eafd7
)
Merge branch 'for-4.1/sensor-hub' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Mon, 13 Apr 2015 21:43:34 +0000
(23:43 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Mon, 13 Apr 2015 21:43:34 +0000
(23:43 +0200)
Conflicts:
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
include/linux/hid-sensor-hub.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff