]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 02:17:35 +0000 (12:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 02:17:35 +0000 (12:17 +1000)
commit5696942cfbbd504c8fc3ce0d376ec36910da9dae
tree13e732fa6871edb9726e19dea1e1011bfb3b6de8
parenta0a643d132f80eccf913ec6861384d1dd6f0a69b
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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