• Linus Torvalds's avatar
    Merge tag 'edac_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 794e96e8
    Linus Torvalds authored
    Pull EDAC updates from Borislav Petkov:
     "Following up on last week's discussion, here's my part of the EDAC
      pile, highlights in the signed tag.
    
      The last two patches have a date from just now because I've just
      applied them to the tree after Johannes sent them to me earlier.  I
      decided to forward them now because they're trivial.
    
      There's a third one for MPC85xx which adds PCIe error interrupt
      support but since it is not so trivial and hasn't seen any linux-next
      time, I'm deferring it to 3.14
    
      EDAC update highlights:
       - Support for Calxeda ECX-2000 memory controller, from Robert Richter
       - Misc Calxeda Highbank drivers and EDAC core cleanups, from Rob
         Herring and Robert Richter
       - New maintainer for Freescale's MPC85xx EDAC driver: Johannes
         Thumshirn"
    
    * tag 'edac_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      edac/85xx: Remove mpc85xx_pci_err_remove
      EDAC: Add edac-mpc85xx driver to MAINTAINERS
      edac, highbank: Moving error injection to sysfs for edac
      edac, highbank: Add MAINTAINERS entry
      edac: Unify reporting of device info for device, mc and pci
      edac, highbank: Improve and unify naming
      edac, highbank: Add Calxeda ECX-2000 support
      ARM: dts: calxeda: move memory-controller node out of ecx-common.dtsi
      edac, highbank: Fix interrupt setup of mem and l2 controller
    794e96e8
ecx-common.dtsi 5.23 KB