]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2015 15:47:08 +0000 (08:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2015 15:47:08 +0000 (08:47 -0700)
commit430ce5653665c685cc706611d6c110f5b1afae0d
tree598e7417df1db0490d59d6bc87b99a341466f770
parentbe9a3ee1b35a8f842500792cdbc9a1f4ff512b29
parent4f0c6bd23e9427391465bf884eb0121136119197
Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/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