git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
befde02
0d1e4b0
0f690cc
92241e6
)
Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and...
author
Jiri Kosina
<jkosina@suse.cz>
Thu, 21 Feb 2013 09:42:39 +0000
(10:42 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Thu, 21 Feb 2013 09:42:39 +0000
(10:42 +0100)
Conflicts:
drivers/hid/i2c-hid/i2c-hid.c
Trivial merge