From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 17:26:15 +0000 (-0800)
Subject: Merge tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: v3.14-rc1~181
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09854dde949d611c6675075cb22927444a28faf6;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'edac_for_3.14' of git://git./linux/kernel/git/bp/bp

Pull EDAC updates from Borislav Petkov:
 - mpc85xx PCIe error interrupt support
 - misc small enhancements/fixes all over the place.

* tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Don't try to cancel workqueue when it's never setup
  e752x_edac: Fix pci_dev usage count
  sb_edac: Mark get_mci_for_node_id as static
  EDAC: Mark edac_create_debug_nodes as static
  amd64_edac: Remove "amd64" prefix from static functions
  amd64_edac: Simplify code around decode_bus_error
  amd64_edac: Mark amd64_decode_bus_error as static
  EDAC: Remove DEFINE_PCI_DEVICE_TABLE macro
  amd64_edac: Fix condition to verify max channels allowed for F15 M30h
  edac/85xx: Add PCIe error interrupt edac support
---

09854dde949d611c6675075cb22927444a28faf6