From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 19 Feb 2008 02:46:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.25-rc3~128
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9a4c8546f3e7c893888bccc2b3416d6214f2664a;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-cd: fix missing residual count setting in DMA mode
  ht6560b: force prefetch for some devices
  ht6560b can only do up to PIO mode 4
  linux/hdsmart.h: fix goofups (take 2)
  via82cxxx: add new PCI id for cx700
  falconide: locking bugfix
  MAINTAINERS: update ide-cd maintainer's email address
  ide/libata: ST310211A has buggy HPA too
  ide: Add missing base addresses for falconide and macide
---

9a4c8546f3e7c893888bccc2b3416d6214f2664a