summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-06-04 13:09:43 +0200
committerJiri Kosina <jkosina@suse.cz>2014-06-04 13:09:43 +0200
commitbeea3f4a29e76561a3aa02cf5314c91a06150f60 (patch)
tree26951e8d2a72e90d95b3da218ef666496a580ecb /include
parentaf5666e0f76023d9c296016024297903a4c83108 (diff)
parentf58b8487bcc898acad3eeea6f950e673d9b79dea (diff)
parentba391e5a5ac6697b8bcae8c0d01439cb765d9ef8 (diff)
parent88f6576fa1552435abff7499a874244f6d8fa94e (diff)
parente4aecaf2f53bc6635b484ee2f1b8a1e4c73e7997 (diff)
Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus