aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/fpga-mgr.c
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2015-10-26 02:16:20 +0000
committerMark Brown <[email protected]>2015-10-26 02:16:20 +0000
commitbb9a13a0209c56cdf27d125a1f2f6f34378c64f4 (patch)
tree8f0930c045b210d163873a9d6068ba3ca7e7d51d /drivers/fpga/fpga-mgr.c
parentMerge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/wm2000', 'a... (diff)
parentASoC: wm8904: harmless underflow in wm8904_put_deemph() (diff)
parentASoC: wm8955: harmless underflow in wm8955_put_deemph() (diff)
parentASoC: wm8960: harmless underflow in wm8960_put_deemph() (diff)
downloadkernel-bb9a13a0209c56cdf27d125a1f2f6f34378c64f4.tar.gz
kernel-bb9a13a0209c56cdf27d125a1f2f6f34378c64f4.zip
Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and 'asoc/topic/wm8960' into asoc-next