Merge branch 'devel'

* devel: (33 commits)
  edac i5000, i5400: fix pointer math in i5000_get_mc_regs()
  edac: allow specifying the error count with fake_inject
  edac: add support for Calxeda highbank L2 cache ecc
  edac: add support for Calxeda highbank memory controller
  edac: create top-level debugfs directory
  sb_edac: properly handle error count
  i7core_edac: properly handle error count
  edac: edac_mc_handle_error(): add an error_count parameter
  edac: remove arch-specific parameter for the error handler
  amd64_edac: Don't pass driver name as an error parameter
  edac_mc: check for allocation failure in edac_mc_alloc()
  edac: Increase version to 3.0.0
  edac_mc: Cleanup per-dimm_info debug messages
  edac: Convert debugfX to edac_dbg(X,
  edac: Use more normal debugging macro style
  edac: Don't add __func__ or __FILE__ for debugf[0-9] msgs
  Edac: Add ABI Documentation for the new device nodes
  edac: move documentation ABI to ABI/testing/sysfs-devices-edac
  i7core_edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  edac: change the mem allocation scheme to make Documentation/kobject.txt happy
  ...

diff --cc Documentation/edac.txt
Simple merge

diff --cc drivers/edac/edac_core.h
Simple merge

diff --cc drivers/edac/edac_device.c
Simple merge

diff --cc drivers/edac/edac_mc.c
Simple merge

diff --cc drivers/edac/i7core_edac.c
index a499c7e,a3c9a37..3672101
--- 1/drivers/edac/i7core_edac.c
--- 2/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@@ -2374,9 -2456,8 +2448,9 @@@ static int __init i7core_init(void
   */
  static void __exit i7core_exit(void)
  {
-       debugf2("MC: " __FILE__ ": %s()\n", __func__);
+       edac_dbg(2, "\n");
        pci_unregister_driver(&i7core_driver);
 +      mce_unregister_decode_chain(&i7_mce_dec);
  }
  
  module_init(i7core_init);

diff --cc drivers/edac/mpc85xx_edac.c
Simple merge

diff --cc drivers/edac/sb_edac.c
index 36ad17e,6f88613..f3b1f9f
--- 1/drivers/edac/sb_edac.c
--- 2/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@@ -555,13 -555,13 +555,13 @@@ static int get_dimm_config(struct mem_c
                pvt->is_close_pg = false;
        }
  
 -      pci_read_config_dword(pvt->pci_ta, RANK_CFG_A, &reg);
 +      pci_read_config_dword(pvt->pci_ddrio, RANK_CFG_A, &reg);
        if (IS_RDIMM_ENABLED(reg)) {
                /* FIXME: Can also be LRDIMM */
-               debugf0("Memory is registered\n");
+               edac_dbg(0, "Memory is registered\n");
                mtype = MEM_RDDR3;
        } else {
-               debugf0("Memory is unregistered\n");
+               edac_dbg(0, "Memory is unregistered\n");
                mtype = MEM_DDR3;
        }
  
@@@ -1601,13 -1596,15 +1596,13 @@@ static void sbridge_unregister_mci(stru
  
        pvt = mci->pvt_info;
  
-       debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
-               __func__, mci, &sbridge_dev->pdev[0]->dev);
+       edac_dbg(0, "MC: mci = %p, dev = %p\n",
+                mci, &sbridge_dev->pdev[0]->dev);
  
 -      mce_unregister_decode_chain(&sbridge_mce_dec);
 -
        /* Remove MC sysfs nodes */
-       edac_mc_del_mc(mci->dev);
+       edac_mc_del_mc(mci->pdev);
  
-       debugf1("%s: free mci struct\n", mci->ctl_name);
+       edac_dbg(1, "%s: free mci struct\n", mci->ctl_name);
        kfree(mci->ctl_name);
        edac_mc_free(mci);
        sbridge_dev->mci = NULL;
@@@ -1825,9 -1821,8 +1820,9 @@@ static int __init sbridge_init(void
   */
  static void __exit sbridge_exit(void)
  {
-       debugf2("MC: " __FILE__ ": %s()\n", __func__);
+       edac_dbg(2, "\n");
        pci_unregister_driver(&sbridge_driver);
 +      mce_unregister_decode_chain(&sbridge_mce_dec);
  }
  
  module_init(sbridge_init);