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 /fs/file_table.c | |
| parent | afa5eb7c68689ced4284f01c96feed44a2d0a127 (diff) | |
| parent | 6d77976800c3f29a0337fadcc9ddd79050fa5620 (diff) | |
Merge branch 'autosuspend' into for-next
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'fs/file_table.c')
0 files changed, 0 insertions, 0 deletions