From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Aug 2012 04:04:03 +0000 (+1000)
Subject: Merge remote-tracking branch 'edac-amd/for-next'
X-Git-Tag: next-20120822~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9dc22790c31e51d36897bf765f43e9b2786c18d3;p=karo-tx-linux.git

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

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

9dc22790c31e51d36897bf765f43e9b2786c18d3