tree 6b100234ff75d462817b948772f5f62aebcf0503
parent facc7a96d443d84060a8679c3fcc51d20d4981c3
parent 2ad2c320a107aceeba984f97ab2a60064101f5d5
author Linus Torvalds <torvalds@linux-foundation.org> 1294676553 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294676553 -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:
  pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.
  pata_hpt37x: actually limit HPT370 to UltraDMA/66
  pata_hpt3x2n: coding style cleanup
  pata_hpt37x: coding style cleanup
  pata_hpt366: coding style cleanup
  pata_hpt3x2n: calculate average f_CNT
  pata_hpt3x2n: clarify about HPT371N support
  pata_hpt{37x|3x2n}: SATA mode filtering
  [libata] avoid needlessly passing around ptr to SCSI completion func
  [libata] new driver acard_ahci, for ATP8620 host controller