diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 09:26:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 09:26:15 -0800 |
| commit | 09854dde949d611c6675075cb22927444a28faf6 (patch) | |
| tree | acba379c7f951290af91a4c6cdf6f12e16ae54b5 /block | |
| parent | a1a3b3efc45518233a4d4738a68a2edd7671efb3 (diff) | |
| parent | 881f0fcef9993992c24f5b649a3fb67fd4208f8f (diff) | |
Merge tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions