Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2007-06-15 17:34:34 -07:00

parent fa04a008a1 d1be0a8225

commit de7f928ca4

2 changed files with 7 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/ide/ide.c

View file

2

drivers/scsi/ide-scsi.c

View file