summaryrefslogtreecommitdiff
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-topology.c')
0 files changed, 0 insertions, 0 deletions
nux/net-next.git/commit/sound/soc/fsl/imx-ssi.c?id=690e5325b8c7d5db05fc569c0f7b888bb4248272'>690e5325b8c7d5db05fc569c0f7b888bb4248272 (diff)parent19e420bb4076ace670addc55300e3b8c4a02dfc6 (diff)
Merge branch 'nvme-4.10-fixes' of git://git.infradead.org/nvme into for-linus
Pull nvme target fixes from Sagi: Given that its -rc6, I removed anything that is not bug fix. - nvmet-fc discard fix from Christoph - queue disconnect fix from James - nvmet-rdma dma sync fix from Parav - Some more nvmet fixes
Diffstat (limited to 'sound/soc/fsl/imx-ssi.c')
2908aaa822097d27c6af8ec8&id2=3b4f18843e511193e7eb616710e838f5852e661d'>diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'sound/soc/img/img-i2s-out.c')