diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-30 10:16:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-30 10:16:51 -0800 |
| commit | efdd17f89510531a6529e20048670bef9a073466 (patch) | |
| tree | 1fbd09b589c4548a030e1319b6663f3970d02476 /drivers/ide/rz1000.c | |
| parent | 3ce120b16cc548472f80cf8644f90eda958cf1b6 (diff) | |
| parent | 7cb4774e2d3282d29edd00762167876a27cc7d2a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- two cosmetic fixes from Daniel Axtens and Hans de Goede
- fix for I2C command mismatch fix for cp2112 driver from Eudean Sun
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: core: lower log level for unknown main item tags to warnings
HID: holtekff: move MODULE_* parameters out of #ifdef block
HID: cp2112: Fix I2C_BLOCK_DATA transactions
Diffstat (limited to 'drivers/ide/rz1000.c')
0 files changed, 0 insertions, 0 deletions