summaryrefslogtreecommitdiffstats
path: root/drivers/char/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 16:57:13 +0200
committerMark Brown <broonie@kernel.org>2015-08-30 16:57:13 +0200
commit0a5ff077572d058d3023d243ba97a7e98d111f4c (patch)
tree347503567262cda92c6557f63b9aac0b490a0474 /drivers/char/Kconfig
parentMerge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/sh', 'asoc/to... (diff)
parentASoC: ssm2518: Add explicit device tree support (diff)
parentASoC: sta529: Remove redundant I2C_FUNC_SMBUS_BYTE_DATA functionality check (diff)
parentASoC: sti_uniperif: Ensure component is unregistered when unload module (diff)
parentASoC: sti-sas: fix x86 compilation issue. (diff)
downloadlinux-0a5ff077572d058d3023d243ba97a7e98d111f4c.tar.xz
linux-0a5ff077572d058d3023d243ba97a7e98d111f4c.zip
Merge remote-tracking branches 'asoc/topic/ssm2518', 'asoc/topic/sta529', 'asoc/topic/sti' and 'asoc/topic/sti-sas' into asoc-next