]> 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, 5 Jun 2009 18:53:44 +0000 (11:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2009 18:53:44 +0000 (11:53 -0700)
commitbe94a4ba093c75e06b6fd2b0476f34812fbd359e
tree0e6929aa585c3d5bf576f214457ab67dd02474f4
parenta4e4b646eb62ca4ce755e2c17aef8f42c8608821
parent65e31643115349fd7a81acbe75ec4a54d5df8aad
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:
  ata_piix: Add HP Compaq nc6000 to the broken poweroff list
  ahci: add warning messages for hp laptops with broken suspend
  pata_efar: fix PIO2 underclocking
  pata_legacy: wait for async probing