]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:45:41 +0000 (11:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:45:41 +0000 (11:45 +1100)
1  2 
drivers/edac/edac_mc.c

Simple merge