diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:27:08 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:27:08 +0200 |
| commit | 36dbe2fc5534291d261a4c63033232aa2f60c2a9 (patch) | |
| tree | 71b1f928dec412b4210f12fac92de593df54fedc /drivers/hid/Makefile | |
| parent | Merge branch 'egalax' into for-linus (diff) | |
| parent | HID: ntrig: add filtering module parameters (diff) | |
| parent | HID: picolcd: Eliminate use after free (diff) | |
| parent | HID: make Prodikeys driver standalone config option (diff) | |
| parent | HID: roccat: cleanup preprocessor macros (diff) | |
| download | linux-36dbe2fc5534291d261a4c63033232aa2f60c2a9.tar.xz linux-36dbe2fc5534291d261a4c63033232aa2f60c2a9.zip | |
Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus
Conflicts:
drivers/hid/Makefile