summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-10-06 23:34:40 +0200
committerJiri Kosina <jkosina@suse.cz>2014-10-06 23:34:40 +0200
commitee5db7e47faccd07a8a17f73afb30345f8331e61 (patch)
tree9d455d495903ecd137563a44cb391338e9758567
parent467669c5740a6f27780b991016995f95a6d47836 (diff)
parent5235166fbc332c8b5dcf49e3a498a8b510a77449 (diff)
parent368d4e59b002d0742fc7c25de8fd7b6ad37a434c (diff)
parent604b607748a576c3861f549772b72fb62c05a3fd (diff)
parent5b65c2a0296644dd3dbdd590d6f00174d18c96b3 (diff)
parent981c5b4a3b372402dc3aeae3a7a3eb687df44067 (diff)
parent8493ecca74a7b4a66e19676de1a0f14194179941 (diff)
parent5df4eb054fe056ecb15875e812fdadbc47568d7d (diff)
parent5ae6e89f7409cb5d218bb728326eba9c650d9700 (diff)
Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus