Merge remote-tracking branch 'edac-amd/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Nov 2012 01:23:42 +0000 (12:23 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 9 Nov 2012 01:23:42 +0000 (12:23 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Nov 2012 01:23:42 +0000 (12:23 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Nov 2012 01:23:42 +0000 (12:23 +1100)
diff --cc drivers/edac/Kconfig
Simple merge
diff --cc drivers/edac/edac_mc.c
Simple merge
diff --cc include/linux/edac.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Nov 2012 01:23:42 +0000 (12:23 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 9 Nov 2012 01:23:42 +0000 (12:23 +1100)
		1	2
drivers/edac/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/edac/edac_mc.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/edac.h	patch \|	diff1 \|	diff2 \|	blob \| history