From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Jun 2010 00:09:03 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.35-rc3~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d3d769c605ebdf9fbb5a9d63827598b48351861;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: redo stopping DMA engines on empty ports
  sata_sil24: fix kernel panic on ARM caused by unaligned access in sata_sil24
  ahci: add pci quirk for JMB362
  sata_via: explain the magic fix
---

4d3d769c605ebdf9fbb5a9d63827598b48351861