Revision 8c8c4bafc3a20a6fb9078315ff865bc42276f9ba authored by Linus Torvalds on 30 January 2007, 16:46:17 UTC, committed by Linus Torvalds on 30 January 2007, 16:46:17 UTC
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: fix translation for START STOP UNIT
  libata-scsi: ata_task_ioctl should return ATA registers from sense data
  pata_platform: set_mode fix
  ata_if_xfermask() word 51 fix
  pata_sil680: PIO1 taskfile transfers overclocking fix (repost)
  libata: fix ata_eh_suspend() return value
  ahci: port_no should be used when clearing IRQ in ahci_thaw()

Fix trivial conflict in drivers/ata/pata_platform.c manually
2 parent s ad2e62a + 78981a7
History
File Mode Size
amijoy.txt -rw-r--r-- 7.5 KB
appletouch.txt -rw-r--r-- 3.1 KB
atarikbd.txt -rw-r--r-- 25.5 KB
cd32.txt -rw-r--r-- 535 bytes
cs461x.txt -rw-r--r-- 2.1 KB
ff.txt -rw-r--r-- 7.3 KB
gameport-programming.txt -rw-r--r-- 5.9 KB
iforce-protocol.txt -rw-r--r-- 7.8 KB
input-programming.txt -rw-r--r-- 9.7 KB
input.txt -rw-r--r-- 10.9 KB
interactive.fig -rw-r--r-- 1.4 KB
joystick-api.txt -rw-r--r-- 9.5 KB
joystick-parport.txt -rw-r--r-- 19.6 KB
joystick.txt -rw-r--r-- 20.1 KB
shape.fig -rw-r--r-- 1.9 KB
xpad.txt -rw-r--r-- 6.8 KB
yealink.txt -rw-r--r-- 6.0 KB

back to top