]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:28:06 +0000 (14:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:28:06 +0000 (14:28 +1000)
commit626c4578538a3e6b2658406f4dee8e70f9c153c1
treea5b6c63979662fa4f4cde3eda9e2d2cf7ef002e3
parent3e8d35f184c32e867dfd3e8dacd6f90eb26eab55
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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