diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 11:15:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 11:15:29 -0400 |
| commit | dc8dcad83b53e3aebc52889e81772c00a1490408 (patch) | |
| tree | f19eb0facffd0aa6b462189ced0dddb64a1e9640 /drivers/infiniband/hw/ehca/ehca_qp.c | |
| parent | fdc76bf9b62446c9d4b00e0d355c3212b4f1b13b (diff) | |
| parent | b78152e9dbab6d6175e2adcbd8c62959e8f0f922 (diff) | |
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/infiniband/hw/ehca/ehca_qp.c')
0 files changed, 0 insertions, 0 deletions