Merge remote-tracking branch 'libata/for-next'

diff --cc Documentation/devicetree/bindings/ata/ahci-platform.txt
index 796e2c23e5df1863a238384cf0c1a60911584100,3d84dcae8475eba6d975505682be4525f22ef022..30df832a6f2f513f4e23841dd0a0ad888cc13dba
--- 1/Documentation/devicetree/bindings/ata/ahci-platform.txt
--- 2/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@@ -11,9 -11,9 +11,10 @@@ Required properties
  - compatible        : compatible string, one of:
    - "allwinner,sun4i-a10-ahci"
    - "hisilicon,hisi-ahci"
+   - "cavium,octeon-7130-ahci"
    - "ibm,476gtr-ahci"
    - "marvell,armada-380-ahci"
 +  - "marvell,armada-3700-ahci"
    - "snps,dwc-ahci"
    - "snps,exynos5440-ahci"
    - "snps,spear-ahci"

diff --cc arch/mips/include/asm/octeon/cvmx.h
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge