From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Dec 2010 18:25:02 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.0~2556
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e838c7e6ebaf7b2febaafe2cd598a44fdceb094;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:
  pata_cs5536: avoid implicit MSR API inclusion on x86-64
---

4e838c7e6ebaf7b2febaafe2cd598a44fdceb094