From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 18 May 2007 03:02:36 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22-rc2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d3a36fb82a0864a85e238ac946817030a18c5f9a;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_via: pcim_iomap_regions() conversion missed BAR5
  libata: remove libata.spindown_compat
  sata_nv: fix fallout of devres conversion
  drivers/ata: remove the wildcard from sata_nv driver
---

d3a36fb82a0864a85e238ac946817030a18c5f9a