From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Sep 2012 03:55:38 +0000 (+1000)
Subject: Merge remote-tracking branch 'edac-amd/for-next'
X-Git-Tag: next-20120907~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=703be944859d4d3ed8764eb4bdec47a57fb62d3c;p=karo-tx-linux.git

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

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

703be944859d4d3ed8764eb4bdec47a57fb62d3c