]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 04:02:27 +0000 (14:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 04:02:27 +0000 (14:02 +1000)

Trivial merge