Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16...
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
commitbeea3f4a29e76561a3aa02cf5314c91a06150f60
tree26951e8d2a72e90d95b3da218ef666496a580ecb
parentaf5666e0f76023d9c296016024297903a4c83108
parentf58b8487bcc898acad3eeea6f950e673d9b79dea
parentba391e5a5ac6697b8bcae8c0d01439cb765d9ef8
parent88f6576fa1552435abff7499a874244f6d8fa94e
parente4aecaf2f53bc6635b484ee2f1b8a1e4c73e7997
Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/leds/Kconfig
include/linux/hid.h
include/uapi/linux/input.h