From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Jun 2015 15:47:08 +0000 (-0700)
Subject: Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: firefly_0821_release~176^2~1671
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=86579aa470dee9c6038ac4adf0f8c4863a215865;p=firefly-linux-kernel-4.4.55.git

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

Pull libata fixes from Tejun Heo:
 "Two driver fixes.  One is for an ahci_mvebu controller config bug and
  the other fixes pata_octeon_cf build issue"

* 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  pata_octeon_cf: fix broken build
  ata: ahci_mvebu: Fix wrongly set base address for the MBus window setting
---

86579aa470dee9c6038ac4adf0f8c4863a215865