]> 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)
commit067085ece2cb24a1f3266758f0900c731038966a
tree04fcbf50c0a0b17e4604ddbea50485d38014c3bd
parentffd5c072c15cb4d7f17af7cce627db81b8e0f0e3
parent8d2f698206d24256728c4c8bbc7f4501faa6dbf2
Merge branch 'for-3.12/sensor-hub' into for-linus

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