diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-29 13:34:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-29 13:34:15 -0800 |
| commit | e6c9f716ba91c1e065b75949f643383d1888bed5 (patch) | |
| tree | 792131212ba9323283ea8541bcc440a71ae401f7 /fs/lockd | |
| parent | 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 (diff) | |
| parent | 346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: ohci1394: revert fail on error in suspend
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions