]> git.baikalelectronics.ru Git - kernel.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)
commit3a76333c795b39e79352376cee2f32baf6406ebc
treedaa6efef3d8ce80515a85c7500a858bd8ec0be2c
parentb064ca5e27743e8035d3ac39aca02039ad40b90d
parentbbc271db9cf2dc8b6999a9780bac14bce96c789f
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