commit | b53343fc6c6f30ff5c6391d6f56d531afc2f4f7a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 03 12:10:12 2015 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 03 12:10:12 2015 -0700 |
tree | bda23be6e78a3e4aba60b49dc792c9cb290890ea | |
parent | 5a8011cb896ed9822ca9086cf9c4d4c5db16be64 [diff] | |
parent | 75a15a7864c9e281c74a1670b10b69d1d7ff1c82 [diff] |
Merge tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp Pull EDAC fix from Borislav Petkov: "A build fix for octeon_edac from Aaro Koskinen" * tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, octeon: Fix broken build due to model helper renames