]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 03:18:52 +0000 (13:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 03:18:52 +0000 (13:18 +1000)
1  2 
arch/mips/bcm63xx/nvram.c

Simple merge