]> 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, 8 Oct 2012 01:35:03 +0000 (12:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:35:03 +0000 (12:35 +1100)
commitbf15e417937e373e5acd2ad0265d9b7307556617
tree10d7ff9f06d66960af49a700b4baa2d05f040072
parentd936b124b529cb919a49b76e228e83b001237f98
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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