summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-lgff.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-02-21 10:45:01 +0100
committerJiri Kosina <jkosina@suse.cz>2013-02-21 10:45:01 +0100
commit73759518d6d6b56e398791b7522328baf4181a82 (patch)
treea91375dfdb9f3aff472ceef897f5c076d40763a5 /drivers/hid/hid-lgff.c
parent539cf54bdd922474d22585837c9fec3343d7061b (diff)
parent483f86a54c6d89f16da2e53f2b7b6205b34756df (diff)
parent7e3cc447ff8906558619b1ecc46e4bd776a4f3a6 (diff)
parent1b474fe82d4eed3c909f02be82586284827c1705 (diff)
parent30ba2fbde1840db440915491cdde235b72a11384 (diff)
downloadlinux-73759518d6d6b56e398791b7522328baf4181a82.tar.bz2
Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus