Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

The representation of the above is reflected in the directory tree

in EDAC's sysfs interface. Starting in directory

/sys/devices/system/edac/mc each memory controller will be represented

by its own 'mcX' directory, where 'X" is the index of the MC.

by its own 'mcX' directory, where 'X' is the index of the MC.

	..../edac/mc/

		   ....

Under each 'mcX' directory each 'csrowX' is again represented by a

'csrowX', where 'X" is the csrow index:

'csrowX', where 'X' is the csrow index:

	.../mc/mc0/

In 'mcX' directories are EDAC control and attribute files for

this 'X" instance of the memory controllers:

this 'X' instance of the memory controllers:

Counter reset control file:

'csrowX' DIRECTORIES

In the 'csrowX' directories are EDAC control and attribute files for

this 'X" instance of csrow:

this 'X' instance of csrow:

Total Uncorrectable Errors count attribute file:

obj-$(CONFIG_EDAC_MM_EDAC)		+= edac_core.o

obj-$(CONFIG_EDAC_MCE)			+= edac_mce.o

edac_core-objs	:= edac_mc.o edac_device.o edac_mc_sysfs.o edac_pci_sysfs.o

edac_core-objs	+= edac_module.o edac_device_sysfs.o

edac_core-y	:= edac_mc.o edac_device.o edac_mc_sysfs.o edac_pci_sysfs.o

edac_core-y	+= edac_module.o edac_device_sysfs.o

ifdef CONFIG_PCI

edac_core-objs	+= edac_pci.o edac_pci_sysfs.o

edac_core-y	+= edac_pci.o edac_pci_sysfs.o

endif

obj-$(CONFIG_EDAC_MCE_INJ)		+= mce_amd_inj.o

edac_mce_amd-objs			:= mce_amd.o

edac_mce_amd-y				:= mce_amd.o

obj-$(CONFIG_EDAC_DECODE_MCE)		+= edac_mce_amd.o

obj-$(CONFIG_EDAC_AMD76X)		+= amd76x_edac.o

	return 0;

err_sysfs_create:

	while (i-- >= 0)

	while (--i >= 0)

		sysfs_remove_file(mce_kobj, &sysfs_attrs[i]->attr);

	kobject_del(mce_kobj);