From: Linus Torvalds Date: Thu, 21 Feb 2008 03:56:23 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Tag: v2.6.25-rc3~105 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7be5cb14611945044306ecb7444678c43df21135;p=linux-2.6-omap-h63xx.git 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 --- 7be5cb14611945044306ecb7444678c43df21135