summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-05 19:55:05 +0200
committerMark Brown <broonie@kernel.org>2015-06-05 19:55:05 +0200
commit28bedc59469e869c1ed9c30384d61798d6c3eb5c (patch)
tree70d450ee955f9c35abc6b7df201f32e2c265dcf3 /net/ceph
parentMerge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tas2552', 'as... (diff)
parentALSA: topology: Export ID types for TLV controls. (diff)
parentASoC: twl6040: Pass the IRQF_ONESHOT flag (diff)
parentASoC: wm5100: Pass the IRQF_ONESHOT flag (diff)
parentASoC: wm8741: check for error returns from wm8741_set_pdata() (diff)
parentASoC: wm8960: add 32 bit word length support (diff)
downloadlinux-28bedc59469e869c1ed9c30384d61798d6c3eb5c.tar.xz
linux-28bedc59469e869c1ed9c30384d61798d6c3eb5c.zip
Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc/topic/wm5100', 'asoc/topic/wm8741' and 'asoc/topic/wm8960' into asoc-next