]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d4a4f75 4710f2f)
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)
commit86579aa470dee9c6038ac4adf0f8c4863a215865
tree598e7417df1db0490d59d6bc87b99a341466f770tree | snapshot
parentd4a4f75cd8f29cd9464a5a32e9224a91571d6649commit | diff
parent4710f2facb5c68d629015747bd09b37203e0d137commit | diff
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
Linux kernel for KaRo TX COM modules