]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'i7core_edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 02:29:31 +0000 (12:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 02:29:31 +0000 (12:29 +1000)
1  2 
drivers/edac/i7core_edac.c

Simple merge