]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 May 2007 03:02:36 +0000 (20:02 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 May 2007 03:02:36 +0000 (20:02 -0700)
commitd3a36fb82a0864a85e238ac946817030a18c5f9a
treedaa6efef3d8ce80515a85c7500a858bd8ec0be2c
parente94bd23f67c87011f012f26ca0af3fcf6878eeac
parent8fd7d1b16ea0e1b3b0823ed91b58993d6c6a1cc6
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