]> 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, 20 Aug 2012 04:02:41 +0000 (14:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 04:02:41 +0000 (14:02 +1000)
commit3ca3330b14b0e93d209cf7860d56a57f0c8b67e5
tree1b1666f97426eae563320cc73801a9ba42dc6202
parentf408e42cc6ba5e168fd60d1ee5db13b9e04bea20
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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