]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 04:13:01 +0000 (14:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 04:13:01 +0000 (14:13 +1000)
commit3e6a190934af522bf56b4f34d37f7be72ecf68b3
tree6b45923e47c0cc8b39d72624efd903eca8ad1ea5
parent902a76e025b6cc54cc4e0ffec32b4470cef7ece7
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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