]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.8/sensors' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 12 Dec 2012 15:52:27 +0000 (16:52 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 12 Dec 2012 15:52:27 +0000 (16:52 +0100)
commit34fa6e6fb34e9ecb54c51862b44eda3d79bc7648
tree2301c8bf5a58e1c6edcafa0bb365d7eb3190e611
parentccc7c21e4df3a57c6c6704340cadb693ea11a3db
parent68fd32b8228a62ca7f46ed64da8267daad29480b
Merge branch 'for-3.8/sensors' into for-next

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