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)
commit4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e
tree04fcbf50c0a0b17e4604ddbea50485d38014c3bd
parent63faf15dba4a7d6fb18ed5c45670a152d0c5330b
parent7b0692f1c60a9551f8ad5fe706b79a23720a196c
Merge branch 'for-3.12/sensor-hub' into for-linus

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