From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Nov 2009 02:15:18 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.0~7029
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc79d2f21a2dc19df26f0cb0b46be2d6241b627b;p=platform%2Fkernel%2Flinux-amlogic.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:
  sata_via: Remove redundant device ID for VIA VT8261
  drivers/ata/libata: Move dereference after NULL test
  ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2
---

dc79d2f21a2dc19df26f0cb0b46be2d6241b627b