]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 15:15:29 +0000 (08:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 15:15:29 +0000 (08:15 -0700)
commitdc8dcad83b53e3aebc52889e81772c00a1490408
treef19eb0facffd0aa6b462189ced0dddb64a1e9640
parentfdc76bf9b62446c9d4b00e0d355c3212b4f1b13b
parentb78152e9dbab6d6175e2adcbd8c62959e8f0f922
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_via: load DEVICE register when CTL changes
  libata: set device class to NONE if phys_offline
  libata-eh: fix slave link EH action mask handling
  libata: transfer EHI control flags to slave ehc.i
  libata-sff: fix ata_sff_post_internal_cmd()
  libata: initialize port_task when !CONFIG_ATA_SFF