diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-09-06 11:59:53 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-06 11:59:53 +0200 |
| commit | 4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e (patch) | |
| tree | 04fcbf50c0a0b17e4604ddbea50485d38014c3bd /drivers/hid/hid-roccat-isku.c | |
| parent | Merge branches 'for-3.12/devm', 'for-3.12/i2c-hid', 'for-3.12/i2c-hid-dt', 'f... (diff) | |
| parent | HID: hid-sensor-hub: change kmalloc + memcpy by kmemdup (diff) | |
| download | linux-4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e.tar.xz linux-4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e.zip | |
Merge branch 'for-3.12/sensor-hub' into for-linus
Conflicts:
drivers/hid/hid-sensor-hub.c
Diffstat (limited to 'drivers/hid/hid-roccat-isku.c')
0 files changed, 0 insertions, 0 deletions