tree aa381f5a5ecdb7f0f144bb2afa919b44782de0b8
parent 1803f3389b7ac9ed33ea561b3b94e22e2864a95d
parent 73fd8b6d310196ae878767200786503fcff57bd5
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203566183 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203566183 -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:
  libata: fix kernel-doc parameter warning
  sata_mv: remove iounmap in mv_platform_remove and use devm_iomap
  ata: fix sparse warning in libata.h
  libata: implement libata.force module parameter
  sata_mv: use hpriv->base instead of the host->iomap
  sata_mv: Define module alias for platform device
  ata: fix sparse warnings in pata_legacy.c