tree d73f3f235a5c3dda8fe0b3c4610625a024749cdb
parent 49fdf6785fd660e18a1eb4588928f47e9fa29a9a
parent 87943acf60898a3efb6b5ee85d4cc789898bf5e8
author Linus Torvalds <torvalds@linux-foundation.org> 1225212168 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225212168 -0700

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:
  libata: ahci enclosure management bit mask
  libata: ahci enclosure management led sync
  pata_ninja32: suspend/resume support
  libata: Fix LBA48 on pata_it821x RAID volumes.
  libata: clear saved xfer_mode and ncq_enabled on device detach
  sata_sil24: configure max read request size to 4k
  libata: add missing kernel-doc
  libata: fix device iteration bugs
  ahci: Add support for Promise PDC42819
  ata: Switch all my stuff to a common address