From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Nov 2011 01:26:22 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8174a06eba10a43375d1dd6f74c58a71519e3be5;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev

* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  libata: fix build without BMDMA
  [libata] ahci_platform: fix DT probing
---

8174a06eba10a43375d1dd6f74c58a71519e3be5