From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 01:35:03 +0000 (+1100)
Subject: Merge remote-tracking branch 'edac-amd/for-next'
X-Git-Tag: next-20121008~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bf15e417937e373e5acd2ad0265d9b7307556617;p=karo-tx-linux.git

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

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

bf15e417937e373e5acd2ad0265d9b7307556617