aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/fpga-mgr.c
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2015-10-26 02:16:16 +0000
committerMark Brown <[email protected]>2015-10-26 02:16:16 +0000
commit9939b14b743f534005dfdaa1e519ff99c7a135c2 (patch)
tree8bc3607c2befe3eb43c4e1c0fa7a79af26003a13 /drivers/fpga/fpga-mgr.c
parentMerge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc... (diff)
parentASoC: ssm2518: Drop .volatile_reg implementation (diff)
parentASoC: sun4i-codec: Remove the routing property (diff)
downloadkernel-9939b14b743f534005dfdaa1e519ff99c7a135c2.tar.gz
kernel-9939b14b743f534005dfdaa1e519ff99c7a135c2.zip
Merge remote-tracking branches 'asoc/topic/ssm2518' and 'asoc/topic/sunxi' into asoc-next