From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 26 Feb 2008 15:49:36 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.12-rc1~22652
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d6ce332537ad0a6f77caa469e09d7335187767b;p=kernel%2Fkernel-generic.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:
  Revert "power_state: get rid of write-only variable in SATA"
  make atapi_dmadir static
---

3d6ce332537ad0a6f77caa469e09d7335187767b