diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 17:15:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 17:15:29 +0200 |
| commit | dc8dcad83b53e3aebc52889e81772c00a1490408 (patch) | |
| tree | f19eb0facffd0aa6b462189ced0dddb64a1e9640 /drivers/net | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | sata_via: load DEVICE register when CTL changes (diff) | |
| download | linux-dc8dcad83b53e3aebc52889e81772c00a1490408.tar.xz linux-dc8dcad83b53e3aebc52889e81772c00a1490408.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* '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
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions