]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.16/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 28 May 2014 14:28:59 +0000 (16:28 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 28 May 2014 14:28:59 +0000 (16:28 +0200)
commit5044df95c5c2923f6d0a3b842b72ee51727ddc99
tree06f5161ee4bd9fab3dd19774297026d3d5240448
parentfd18a1166ad25e7659c6c9da1309ac0081aa40fa
parent00478ee8984a80e531ed491eede0459eae07396d
Merge branch 'for-3.16/upstream' into for-next

Conflicts:
drivers/hid/hid-sensor-hub.c
drivers/hid/hid-ids.h
drivers/hid/hid-sensor-hub.c