www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Wed, 6 Feb 2008 18:47:46 +0000 (10:47 -0800)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Wed, 6 Feb 2008 18:47:46 +0000 (10:47 -0800)

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ata_piix.c:piix_init_one() must be __devinit
  sata_via.c: Remove missleading comment.
  libata-core: unblacklist HITACHI drives
  sata_nv: fix ATAPI issues with memory over 4GB (v7)
  ata: drivers/ata/sata_mv.c needs dmapool.h
  libata: kill now unused n_iter and fix sata_fsl
  ahci: fix CAP.NP and PI handling
  sata_mv: Support SoC controllers
  Rename: linux/pata_platform.h to linux/ata_platform.h

Trivial merge