| commit | 86579aa470dee9c6038ac4adf0f8c4863a215865 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 08 08:47:08 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 08 08:47:08 2015 -0700 |
| tree | 598e7417df1db0490d59d6bc87b99a341466f770 | |
| parent | d4a4f75cd8f29cd9464a5a32e9224a91571d6649 [diff] | |
| parent | 4710f2facb5c68d629015747bd09b37203e0d137 [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