From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 20 May 2006 17:35:41 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.12-rc1~36132
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6566a3f8f3281497a81815dfe2b64eb54dafe05d;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata-core: fix current kernel-doc warnings
  [PATCH] sata_mv: version bump
  [PATCH] sata_mv: endian fix
  [PATCH] sata_mv: remove local copy of queue indexes
  [PATCH] sata_mv: spurious interrupt workaround
  [PATCH] sata_mv: chip initialization fixes
  [PATCH] sata_mv: deal with interrupt coalescing interrupts
  [PATCH] sata_mv: prevent unnecessary double-resets
---

6566a3f8f3281497a81815dfe2b64eb54dafe05d