]> 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>
Mon, 17 Sep 2012 06:13:05 +0000 (16:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 06:13:05 +0000 (16:13 +1000)
commit3990c71c28ded5268e57da68afd4a16cdb5aeb86
treee495f7411ae72d91ba317c70df6d9d0aa3c3b7a3
parentb90238dff27de77afee9555fbb83684d8955c5d3
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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