Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Oct 2006 18:19:47 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Oct 2006 18:19:47 +0000 (11:19 -0700)
commit6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e
tree556f9fa6e4b34082f3fbf54dfbd249b29967be28
parent60ca97584fcb98d2f1b14e4c2f12203dd5b3888e
parent701328a7b58d50d8640c21ba5fdf3170b1ddac16
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] pata-qdi: fix le32 in data_xfer
  [libata] sata_promise: add PCI ID
  [PATCH] libata: return sense data in HDIO_DRIVE_CMD ioctl
  [PATCH] libata: Don't believe bogus claims in the older PIO mode register