]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'i7300_edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 02:34:24 +0000 (12:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 02:34:24 +0000 (12:34 +1000)

Trivial merge