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)
Conflicts:
drivers/hid/hid-sensor-hub.c


Trivial merge