]> 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>
Wed, 3 Oct 2012 05:11:58 +0000 (15:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:11:58 +0000 (15:11 +1000)
commit484ab6b5bfc4d0ff3bb898bd9d0aacab81517e55
tree515c014d020eb3afc6d6f9ac09c39fd7656aec6d
parentbbb58108ee2cdcbc2858edd5e7ddc66f6b0d7897
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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