]> 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>
Thu, 27 Sep 2012 04:25:47 +0000 (14:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 04:25:47 +0000 (14:25 +1000)
commit364f87de220c2a9a3d4217e7a33000e42e6cccb4
tree797322d75d38506c79a57625a319cb5c88daf0c0
parent92f3911f0b841844db1cec3858d0ca9bfe43fc19
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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