]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
authorMark Brown <broonie@kernel.org>
Thu, 5 Feb 2015 19:34:10 +0000 (19:34 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 5 Feb 2015 19:34:10 +0000 (19:34 +0000)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge