aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/fpga-mgr.c
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2015-10-07 15:07:50 +0000
committerMark Brown <[email protected]>2015-10-07 15:07:50 +0000
commite4fc141d2a022a63c87a4851b3c688eca6a1647b (patch)
tree4b0cfe1164f6c20b751cf34940d2c47a87118388 /drivers/fpga/fpga-mgr.c
parentMerge remote-tracking branches 'asoc/fix/db1200', 'asoc/fix/dwc', 'asoc/fix/i... (diff)
parentASoC: tlv320aic3x: Prevent writing reserved registers on tlv320aic3104 CODECs (diff)
parentASoC: wm8962: balance pm_runtime_enable (diff)
downloadkernel-e4fc141d2a022a63c87a4851b3c688eca6a1647b.tar.gz
kernel-e4fc141d2a022a63c87a4851b3c688eca6a1647b.zip
Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' into asoc-linus