]> 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, 19 Sep 2012 03:04:06 +0000 (13:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 03:04:06 +0000 (13:04 +1000)
commit67454f43e38433c7f9ef2402bdea5e14a4564eda
tree3740eda679eb8db1c404ec5ddef714fa33e6c377
parent688e95c9dc883694da9af8377f895f0d0e19befd
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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