Skip to main content

Browse the archive

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 
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
 
* '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
Makefile -rw-r--r-- 156 bytes
configfs_internal.h -rw-r--r-- 4.6 KB
dir.c -rw-r--r-- 27.3 KB
file.c -rw-r--r-- 9.6 KB
inode.c -rw-r--r-- 6.7 KB
item.c -rw-r--r-- 5.5 KB
mount.c -rw-r--r-- 4.6 KB
symlink.c -rw-r--r-- 6.5 KB
back to top