From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 25 Jul 2012 01:39:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'edac-amd/for-next'
X-Git-Tag: next-20120725~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e5800e41d8c014a40248edbc2426f6c7ba08d287;p=karo-tx-linux.git

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

Conflicts:
	Documentation/edac.txt
	drivers/edac/amd64_edac.c
---

e5800e41d8c014a40248edbc2426f6c7ba08d287