diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-03-30 15:14:53 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-03-30 15:14:53 +0200 |
| commit | 621de593081524da2f0f7b060f5951b4155eb4a2 (patch) | |
| tree | dcb1777094498496a3036b0e49546887e72d6a06 /drivers/net/irda/nsc-ircc.c | |
| parent | HID: remove compat stuff (diff) | |
| parent | HID: autosuspend -- fix lockup of hid on reset (diff) | |
| download | linux-621de593081524da2f0f7b060f5951b4155eb4a2.tar.xz linux-621de593081524da2f0f7b060f5951b4155eb4a2.zip | |
Merge branch 'autosuspend' into for-next
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/net/irda/nsc-ircc.c')
0 files changed, 0 insertions, 0 deletions