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
man
.gitignore -rw-r--r-- 35 bytes
Makefile -rw-r--r-- 6.6 KB
deviceiobook.tmpl -rw-r--r-- 10.9 KB
filesystems.tmpl -rw-r--r-- 12.2 KB
gadget.tmpl -rw-r--r-- 28.6 KB
genericirq.tmpl -rw-r--r-- 15.2 KB
kernel-api.tmpl -rw-r--r-- 14.5 KB
kernel-hacking.tmpl -rw-r--r-- 42.7 KB
kernel-locking.tmpl -rw-r--r-- 65.2 KB
libata.tmpl -rw-r--r-- 46.9 KB
librs.tmpl -rw-r--r-- 8.0 KB
lsm.tmpl -rw-r--r-- 12.0 KB
mcabook.tmpl -rw-r--r-- 3.0 KB
mtdnand.tmpl -rw-r--r-- 43.9 KB
procfs-guide.tmpl -rw-r--r-- 18.3 KB
procfs_example.c -rw-r--r-- 5.1 KB
rapidio.tmpl -rw-r--r-- 4.4 KB
stylesheet.xsl -rw-r--r-- 310 bytes
usb.tmpl -rw-r--r-- 38.2 KB
videobook.tmpl -rw-r--r-- 61.7 KB
wanbook.tmpl -rw-r--r-- 2.7 KB
writing_usb_driver.tmpl -rw-r--r-- 17.0 KB
z8530book.tmpl -rw-r--r-- 15.3 KB

back to top