From: Mark Brown Date: Wed, 23 Sep 2015 18:01:03 +0000 (-0700) Subject: Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/doc', 'asoc/fix/fsl... X-Git-Tag: v4.3-rc3~17^2~1^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=312e0bce7f2d7fcf57f38f6e229a82eb4e0c2af4;p=karo-tx-linux.git Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/doc', 'asoc/fix/fsl-card', 'asoc/fix/fsl-ssi', 'asoc/fix/intel' and 'asoc/fix/maintainers' into asoc-linus --- 312e0bce7f2d7fcf57f38f6e229a82eb4e0c2af4 diff --cc MAINTAINERS index 274f85405584,7ba7ab749c85,fd6078443083,fd6078443083,7ba7ab749c85,8133cefb6b6e,dffea210e439..0581f47e959b --- a/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" + M: Sage Weil + M: Ilya Dryomov + L: ceph-devel@vger.kernel.org + 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 ++ + M: David Woodhouse ++ + L: keyrings@linux-nfs.org ++ + S: Maintained ++ + F: Documentation/module-signing.txt ++ + F: certs/ ++ + F: scripts/extract-cert.c ++ + CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: L: linux-usb@vger.kernel.org S: Orphan @@@@@@@@ -6235,8 -6235,8 -6160,7 -6160,7 -6235,8 -6147,6 -6235,8 +6235,8 @@@@@@@@ L: linux-nvdimm@lists.01.or 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