]> 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, 25 Jul 2012 01:39:43 +0000 (11:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:39:43 +0000 (11:39 +1000)
commite5800e41d8c014a40248edbc2426f6c7ba08d287
tree7a566550649b16bef3df5dd811f9e39e2ec0e177
parentafb221c28a1608ee6ceaf34cdc1926729be9c1b5
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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