]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0a643d 305f1c3)
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 02:17:35 +0000 (12:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 02:17:35 +0000 (12:17 +1000)
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c


Trivial merge
Linux kernel for KaRo TX COM modules