Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Browse source

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_via: load DEVICE register when CTL changes
  libata: set device class to NONE if phys_offline
  libata-eh: fix slave link EH action mask handling
  libata: transfer EHI control flags to slave ehc.i
  libata-sff: fix ata_sff_post_internal_cmd()
  libata: initialize port_task when !CONFIG_ATA_SFF

...

This commit is contained in:

Linus Torvalds 2008-10-23 08:15:29 -07:00

parent fdc76bf9b6 b78152e9db

commit dc8dcad83b

5 changed files with 64 additions and 13 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

2

drivers/ata/libata-core.c

View file

26

drivers/ata/libata-eh.c

View file

11

drivers/ata/libata-sff.c

View file

35

drivers/ata/sata_via.c

View file

3

include/linux/libata.h

View file