From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 21 Jun 2007 00:11:44 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22-rc6~45
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f1518a088bde6aea49e7c472ed6ab96178fcba3e;p=~emulex%2Finfiniband.git

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:
  fix module_param mistake in it821x
  ahci: fix PORTS_IMPL override
  kerneldoc fix in libata
  libata: more NONCQ devices
  pata_it821x: (partially) fix DMA in RAID mode
  PATA: Add the MCP73/77 support to PATA driver
---

f1518a088bde6aea49e7c472ed6ab96178fcba3e