From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 May 2014 09:35:42 +0000 (+0900)
Subject: Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: firefly_0821_release~176^2~3899
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6ab9028d00da2ed34f46a72fa3271b04a402f1e1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.15-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "Mostly device-specific fixes.  The only thing which isn't is the fix
  for zpodd oops-on-detach bug"

* 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: imx: PLL clock needs 100us to settle down
  ata: pata_at91 only works on sam9
  libata: clean up ZPODD when a port is detached
  ahci: imx: software workaround for phy reset issue in resume
  ahci: imx: add namespace for register enums
  ahci: disable DEVSLP for Intel Valleyview
---

6ab9028d00da2ed34f46a72fa3271b04a402f1e1