summaryrefslogtreecommitdiff
path: root/scripts/kconfig/merge_config.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-16 07:31:19 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-16 07:31:19 +0300
commitc1c2ad82c772966d3cdb9a4852329fa2cf71853a (patch)
tree1296ea11754303d3a2cdf5c157984e8aae509e9f /scripts/kconfig/merge_config.sh
parent99a2c789ddeb703cf7b0a3d889ab1a25cf4cbbaf (diff)
parent190bd6e98afc512fb16d4a471acd488e36141637 (diff)
downloadlinux-c1c2ad82c772966d3cdb9a4852329fa2cf71853a.tar.xz
Merge tag 'edac_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov: - Add support for systems with PCI segmented buses to sb_edac, by Masayoshi Mizuma - The usual pile of fixes and cleanups * tag 'edac_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, sb_edac: Add support for systems with segmented PCI buses EDAC, thunderx: Remove VLA usage EDAC, i7core: Fix memleaks and use-after-free on probe and remove EDAC: Fix memleak in module init error path EDAC, altera: Fix an error handling path in altr_s10_sdram_probe()
Diffstat (limited to 'scripts/kconfig/merge_config.sh')
0 files changed, 0 insertions, 0 deletions