tree f4244162d7f1f55ebbe53a717a47ef81988976b2
parent b35e7041186a9ace341665d404274d58a32b6e2c
parent 96af154710d44b574515431a0bb014888398a741
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192851269 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192851269 -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] sata_sis: use correct S/G table size
  pata_cs5536: MWDMA fix
  sata_sis: fix SCR read breakage
  libata: fix kernel-doc param name