]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:02:13 +0000 (12:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:02:13 +0000 (12:02 +1000)
1  2 
arch/mips/alchemy/devboards/db1200.c

Simple merge