diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-12-12 11:09:23 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-12-12 11:09:23 +0100 |
| commit | 3ee420ba2e7fa074a668e30c2d0f4abd317e4927 (patch) | |
| tree | b195f683a4873c0bf5357b1d993df344e67b96d4 | |
| parent | HID: yet another buggy ELAN touchscreen (diff) | |
| parent | HID: i2c-hid: prevent buffer overflow in early IRQ (diff) | |
| parent | HID: saitek: quirk for Saitek R.A.T.7 works with R.A.T.9 too (diff) | |
| download | linux-3ee420ba2e7fa074a668e30c2d0f4abd317e4927.tar.xz linux-3ee420ba2e7fa074a668e30c2d0f4abd317e4927.zip | |
Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
Conflicts:
drivers/hid/hid-input.c