summaryrefslogtreecommitdiffstats
path: root/Documentation/ABI/testing
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 14:27:08 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-19 14:27:08 +0200
commit36dbe2fc5534291d261a4c63033232aa2f60c2a9 (patch)
tree71b1f928dec412b4210f12fac92de593df54fedc /Documentation/ABI/testing
parentMerge branch 'egalax' into for-linus (diff)
parentHID: ntrig: add filtering module parameters (diff)
parentHID: picolcd: Eliminate use after free (diff)
parentHID: make Prodikeys driver standalone config option (diff)
parentHID: roccat: cleanup preprocessor macros (diff)
downloadlinux-36dbe2fc5534291d261a4c63033232aa2f60c2a9.tar.xz
linux-36dbe2fc5534291d261a4c63033232aa2f60c2a9.zip
Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
Conflicts: drivers/hid/Makefile