tree 2ff0180423156c18ac8d7efd2b9d14712d7566c0
parent a11d9b623ea7cdcd647318bb2b3282d4c337f086
parent e4ac522bd7261829197a3d01d5feedb2aca8ae38
author Linus Torvalds <torvalds@linux-foundation.org> 1232124057 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1232124057 -0800

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_fsl: Return non-zero on error in probe()
  drivers/ata/pata_ali.c: s/isa_bridge/ali_isa_bridge/ to fix alpha build
  libata: New driver for OCTEON SOC Compact Flash interface (v7).
  libata: Add another column to the ata_timing table.
  sata_via: Add VT8261 support
  pata_atiixp: update port enabledness test handling
  [libata] get-identity ioctl: Fix use of invalid memory pointer