pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Thu, 25 Oct 2007 22:20:22 +0000 (15:20 -0700)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Thu, 25 Oct 2007 22:20:22 +0000 (15:20 -0700)

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_nv: SWNCQ should not apply to MCP61
  libata-core: Be a bit more relaxed about early DMA zero devices
  ahci: ahci: implement workaround for ASUS P5W-DH Deluxe ahci_broken_hardreset(), take #2
  Fix pata_icside build for recent libata API changes
  libata: cosmetic clean up in ata_eh_reset()
  libata-core.c: make 2 functions static
  [libata] Create internal helper ata_dev_set_feature()

Trivial merge