]> 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, 6 Sep 2012 03:39:53 +0000 (13:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:39:53 +0000 (13:39 +1000)
commit9ba136d50dff99be4536442980a1226fb718abfe
treea7afb4349175475e15d5501d63529f20f7230715
parentd23238412212d2b81c98087596027efce4d5d847
parent305f1c3cfd7eef63bef2128b6934a9054d902976
Merge remote-tracking branch 'edac-amd/for-next'

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