Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <trini@ti.com>
Fri, 26 Jul 2013 19:29:08 +0000 (15:29 -0400)
committerTom Rini <trini@ti.com>
Fri, 26 Jul 2013 19:29:08 +0000 (15:29 -0400)
1  2 
drivers/mtd/cfi_flash.c

Simple merge