diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 17:34:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 17:34:34 -0700 |
| commit | de7f928ca460005086a8296be07c217aac4b625d (patch) | |
| tree | db7ae7a5a536d2cd6b686b69759092eb237e252f /drivers/hid | |
| parent | fa04a008a16ac633a55f41baf9e84b551e613e7e (diff) | |
| parent | d1be0a8225f2cb1cdc356ebb0ae6800f023ce67d (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-scsi: fix OOPS in idescsi_expiry()
Resume from RAM on HPC nx6325 broken
Diffstat (limited to 'drivers/hid')
0 files changed, 0 insertions, 0 deletions