diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-07-24 13:40:06 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-07-24 13:40:06 +0200 |
| commit | c062c4d1de57789bf15f7641a24c429eeb8a1c6a (patch) | |
| tree | dfd376034ea8458689c937dafa5e318892af82af /net/core/netprio_cgroup.c | |
| parent | Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes' and 'upstream' into for-linus (diff) | |
| parent | HID: uhid: Fix sending events with invalid data (diff) | |
| download | linux-dev-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.tar.xz linux-dev-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.zip | |
Merge branch 'uhid' into for-linus
Conflicts:
drivers/hid/Kconfig
Diffstat (limited to 'net/core/netprio_cgroup.c')
0 files changed, 0 insertions, 0 deletions