]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Oct 2009 16:25:11 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Oct 2009 16:25:11 +0000 (09:25 -0700)
commit7c650a0a9dda405ba41df12cf106d1228e50e3ba
tree192d743da2ffbe6305a28b4571b5cefc78d6755a
parent012abeea669ea49636cf952d13298bb68654146a
parent159a7ff7a13f9a02c75006f40c0561a3a81aefcd
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:
  sata_mv: Prevent PIO commands to be defered too long if traffic in progress.
  pata_sc1200: Fix crash on boot
  libata: fix internal command failure handling
  libata: fix PMP initialization
  sata_nv: make sure link is brough up online when skipping hardreset
  ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2
  ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets.
  pata_via: extend the rev_max for VT6330