]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 03:45:48 +0000 (13:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 03:45:48 +0000 (13:45 +1000)
commit625158abc3dfea9537fc647857c8ac3e81c49f9e
treeb3eff6bd3a8e5a60ea4d0405b75c960dc4072cfc
parent485a4c5eb08327baed97f3f79d69c46457cd2a12
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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