]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Aug 2012 02:51:42 +0000 (12:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Aug 2012 02:51:42 +0000 (12:51 +1000)
commitf9bfe152e69129cff99153d961d4c9a0658ea449
treeedf8109db8bea37f09c0127aba750fa7e915b18a
parent39f778a1f7f942bad948bf5417387f35042a7371
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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