]> 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, 24 Aug 2012 04:39:00 +0000 (14:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 04:39:00 +0000 (14:39 +1000)
commitd16c5df2623647b88c88823e6a1697e6ba38ae56
treee9f6760176c03fd6bfeeee35073fffcd8a54b1bf
parent23d5cf2e36a97249644d5720ca9cdb3daa2520d8
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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