From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 05:11:58 +0000 (+1000)
Subject: Merge remote-tracking branch 'edac-amd/for-next'
X-Git-Tag: next-20121003~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=484ab6b5bfc4d0ff3bb898bd9d0aacab81517e55;p=karo-tx-linux.git

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

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

484ab6b5bfc4d0ff3bb898bd9d0aacab81517e55