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
9p.h -rw-r--r-- 6.8 KB
Makefile -rw-r--r-- 215 bytes
conv.c -rw-r--r-- 18.5 KB
conv.h -rw-r--r-- 2.0 KB
debug.h -rw-r--r-- 2.0 KB
error.c -rw-r--r-- 2.2 KB
error.h -rw-r--r-- 6.0 KB
fcall.c -rw-r--r-- 8.7 KB
fcprint.c -rw-r--r-- 8.8 KB
fid.c -rw-r--r-- 4.6 KB
fid.h -rw-r--r-- 1.9 KB
mux.c -rw-r--r-- 23.2 KB
mux.h -rw-r--r-- 1.9 KB
trans_fd.c -rw-r--r-- 6.9 KB
transport.h -rw-r--r-- 1.4 KB
v9fs.c -rw-r--r-- 10.6 KB
v9fs.h -rw-r--r-- 2.7 KB
v9fs_vfs.h -rw-r--r-- 2.2 KB
vfs_addr.c -rw-r--r-- 2.5 KB
vfs_dentry.c -rw-r--r-- 2.4 KB
vfs_dir.c -rw-r--r-- 4.6 KB
vfs_file.c -rw-r--r-- 5.6 KB
vfs_inode.c -rw-r--r-- 28.1 KB
vfs_super.c -rw-r--r-- 6.4 KB

back to top