| commit | 621de593081524da2f0f7b060f5951b4155eb4a2 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Mon Mar 30 15:14:53 2009 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Mon Mar 30 15:14:53 2009 +0200 |
| tree | dcb1777094498496a3036b0e49546887e72d6a06 | |
| parent | afa5eb7c68689ced4284f01c96feed44a2d0a127 [diff] | |
| parent | 6d77976800c3f29a0337fadcc9ddd79050fa5620 [diff] |
Merge branch 'autosuspend' into for-next Conflicts: drivers/hid/hid-core.c