Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/doc', 'asoc/fix/fsl...

diff --cc MAINTAINERS
index 274f85405584e1249c8b089b789f1a4d11973500,7ba7ab749c853a7691dff808d85b2a8f80973fe6,fd60784430838fb99d5cb13ae8767298f6b9b35d,fd60784430838fb99d5cb13ae8767298f6b9b35d,7ba7ab749c853a7691dff808d85b2a8f80973fe6,8133cefb6b6e28715197a86aad555c29edbb7aa1,dffea210e439defff84a03500d469174a90f5cbc..0581f47e959b8706d3ab6f038fa5ecd928ce8527
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
--- 7/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@@ -2615,27 -2615,27 -2576,18 -2576,18 -2615,27 -2575,6 -2615,27 +2615,27 @@@@@@@@ F:     net/ceph
       F:       include/linux/ceph/
       F:       include/linux/crush/
       
     + CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
     + M:       "Yan, Zheng" <[email protected]>
     + M:       Sage Weil <[email protected]>
     + M:       Ilya Dryomov <[email protected]>
     + L:       [email protected]
     + W:       http://ceph.com/
     + T:       git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
     + T:       git git://github.com/ceph/ceph-client.git
     + S:       Supported
     + F:       Documentation/filesystems/ceph.txt
     + F:       fs/ceph/
     + 
  ++ + CERTIFICATE HANDLING:
  ++ + M:       David Howells <[email protected]>
  ++ + M:       David Woodhouse <[email protected]>
  ++ + L:       [email protected]
  ++ + S:       Maintained
  ++ + F:       Documentation/module-signing.txt
  ++ + F:       certs/
  ++ + F:       scripts/extract-cert.c
  ++ + 
       CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
       L:       [email protected]
       S:       Orphan
@@@@@@@@ -6235,8 -6235,8 -6160,7 -6160,7 -6235,8 -6147,6 -6235,8 +6235,8 @@@@@@@@ L:    [email protected]
       Q:       https://patchwork.kernel.org/project/linux-nvdimm/list/
       S:       Supported
       F:       drivers/nvdimm/pmem.c
     + F:       include/linux/pmem.h
  ++ + F:       arch/*/include/asm/pmem.h
       
       LINUX FOR IBM pSERIES (RS/6000)
       M:       Paul Mackerras <[email protected]>

diff --cc sound/soc/intel/haswell/sst-haswell-ipc.c
Simple merge