Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
commitf1518a088bde6aea49e7c472ed6ab96178fcba3e
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Jun 2007 00:11:44 +0000 (20 17:11 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 21 Jun 2007 00:11:44 +0000 (20 17:11 -0700)
tree51d940efef6b7594a3152f4cdd65ae56ebae5f17
parent2090dee420911045258d50239dc2c527e4b1dd06
parent5fe675e2b3e41349deb0c81667065b9cb229ea1d
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:
  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