]> 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, 20 Sep 2012 04:41:56 +0000 (14:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 04:41:56 +0000 (14:41 +1000)
commitca3de61fc371baba4039cd3e00680461fef48d24
treeb3d8988e666c58e584f79d2d78bfc6f85c0cf43b
parent6f6c3c09edbb58e5bd8cc16201058ddbc2a66c62
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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