]> 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>
Thu, 11 Oct 2012 00:41:12 +0000 (11:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 00:41:12 +0000 (11:41 +1100)
commitd88484ccabffc44d1f20a3d06073ecb36928422e
treef4393d2f2b0013af1772bfbf964f57f86cf01c64
parentefa776382fe7a63afe0005b5ef96d687b4a79d10
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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