]> 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>
Sun, 14 Oct 2012 23:52:56 +0000 (10:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 14 Oct 2012 23:52:56 +0000 (10:52 +1100)
commit81ccae75d8b83937c7fe89b16105babaf9ba4778
tree24f9eea5d829ea42e0a744f72a379ce4147b37e2
parentb8359394ee85153fc26033ab0fac256a90dd2730
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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