]> 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>
Fri, 7 Sep 2012 03:55:38 +0000 (13:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 03:55:38 +0000 (13:55 +1000)
commit703be944859d4d3ed8764eb4bdec47a57fb62d3c
tree2c1b03cdaafa602cb2f973561d9dac94191d4336
parent6e164980cfeefc6b029887c7ecb8760b8dd03ee3
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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