tree 0f65410e1d86f29107af8a665e277efd0393451c
parent 5b9b5572c87b460cd91f7722ac233d1873cfb084
parent 15a7c3bbe344d75e4891c7d30595899c12ccfaa1
author Linus Torvalds <torvalds@g5.osdl.org> 1159974376 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159974376 -0700

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:
  [libata] pata_artop: kill gcc warning
  [PATCH] libata: turn off NCQ if queue depth is adjusted to 1
  [PATCH] libata: cosmetic changes to constants
  [libata] DocBook minor updates, fixes
  [libata] PCI ID table cleanup in various drivers
  [libata] Print out Status register, if a BSY-sleep takes too long
  [libata] init probe_ent->private_data in a common location
  [libata] minor PCI IDE probe fixes and cleanups
  [libata] Use new PCI_VDEVICE() macro to dramatically shorten ID lists
  [PATCH] Fix reference of uninitialised memory in ata_device_add()