]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.12/sensor-hub' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 6 Sep 2013 09:59:53 +0000 (11:59 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 6 Sep 2013 09:59:53 +0000 (11:59 +0200)
commit99798483af1dbbd831140d0b17600fc0588aaa95
tree04fcbf50c0a0b17e4604ddbea50485d38014c3bd
parent8a9012116027a31eab0716e776ba857555981f05
parentc6ea92858e7f4375790a616be2e24d5d9356e7f6
Merge branch 'for-3.12/sensor-hub' into for-linus

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