diff options
| author | Linus Torvalds | 2018-01-29 11:47:42 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2018-01-29 11:47:42 -0800 |
| commit | 9697e9da84299d0d715d515dd2cc48f1eceb277d (patch) | |
| tree | aab3df77a5665d966fd1a1f3aafec321aa982c6b /block/blk-merge.c | |
| parent | b5856f97b3cb792806cee5d2b2c747353d238bbf (diff) | |
| parent | 68fa24f9121c04ef146b5158f538c8b32f285be5 (diff) | |
Merge tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov:
- new EDAC driver for some TI SOCs (Tero Kristo)
- small cleanups
* tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC, mv64x60: Fix an error handling path
EDAC, ti: Add support for TI keystone and DRA7xx EDAC
EDAC, octeon: Fix an uninitialized variable warning
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions