From: Linus Torvalds Date: Mon, 13 Apr 2015 21:47:37 +0000 (-0700) Subject: Merge tag 'edac_for_4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp X-Git-Tag: v4.14-rc1~5630 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a370f4cd95e056d55ef5bf1a183880e70195e59;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'edac_for_4.1' of git://git./linux/kernel/git/bp/bp Pull EDAC updates from Borislav Petkov: - convert a bunch of drivers to static attribute groups (Takashi Iwai) - misc cleanups * tag 'edac_for_4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC: Constify of_device_id array EDAC, i82443bxgx: Don't export static symbol EDAC, amd64_edac: Get rid of per-node driver instances EDAC: Properly unwind on failure path in edac_init() EDAC: highbank: Use static attribute groups for sysfs entries EDAC: octeon: Use static attribute groups for sysfs entries EDAC: mpc85xx: Use static attribute groups for sysfs entries EDAC: i7core: Use static attribute groups for sysfs entries EDAC: i7core: Return proper error codes for kzalloc() errors EDAC: amd64: Use static attribute groups EDAC: Allow to pass driver-specific attribute groups EDAC: Use static attribute groups for managing sysfs entries EDAC: Delete unnecessary checks before pci_dev_put() --- 1a370f4cd95e056d55ef5bf1a183880e70195e59