Merge branch 'for-3.15/hid-sensor-hub' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:05:30 +0000 (19:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:05:30 +0000 (19:05 +0200)
1  2 
drivers/hid/hid-sensor-hub.c

Simple merge