summaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm_crb.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 16:55:54 +0200
committerMark Brown <broonie@kernel.org>2015-08-30 16:55:54 +0200
commit532161e6ccbd1c5ac3a2ea9dc60c8e253cd22fa5 (patch)
tree892d8435678ab6ed4ae15aaa72ee2a8effd6bf96 /drivers/char/tpm/tpm_crb.c
parentMerge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'aso... (diff)
parentASoC: rsnd: Silence DMA slave ID compile warning on 64-bit (diff)
parentMerge tag 'regmap-seq-delay-api' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentASoC: rl6231: Simplify DMIC divider calculation expression (diff)
parentASoC: rockchip: fix platform_no_drv_owner.cocci warnings (diff)
parentASoC: rt286: Constify dmi_system_id table (diff)
downloadlinux-532161e6ccbd1c5ac3a2ea9dc60c8e253cd22fa5.tar.xz
linux-532161e6ccbd1c5ac3a2ea9dc60c8e253cd22fa5.zip
Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/reg-default', 'asoc/topic/rl6231', 'asoc/topic/rockchip' and 'asoc/topic/rt286' into asoc-next