]> 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>
Tue, 16 Oct 2012 00:47:43 +0000 (11:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:47:43 +0000 (11:47 +1100)
commit2d5c0a789e5f2b92edc68b5567bfa1e7aba19629
tree135c0dffdd857916ffa5bd77651d3987983a8878
parent12bdb65525d2255c03c591a0286a2364998f1b10
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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