]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.12/sensor-hub' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 10:20:49 +0000 (12:20 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 10:20:49 +0000 (12:20 +0200)
commit63d291ff2b643c7755ed178a4345805e4f930bbd
tree45997a5f219fb56789ebd72fc6e65f1c7b36695e
parent2ed90be6a640e0ba374fa19b64001f338c753cbc
parent7b0692f1c60a9551f8ad5fe706b79a23720a196c
Merge branch 'for-3.12/sensor-hub' into for-next

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