]> 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>
Wed, 26 Sep 2012 03:30:38 +0000 (13:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 03:30:38 +0000 (13:30 +1000)
commit62828bd1a6eefe1598a7c14eef2a9a871a117e19
treea0e42c2ac714e0f31f6471d9cf9b133fff6252df
parentcd9ed01bccd9b9f3c6361e046f7577369d40df08
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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