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)
commit5b9c79a81db80c3f9e50c77477957cd803429af8
tree55b007053cbe4a1fff47e23cb29fce11ebc8b09f
parentaaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c
parentd8b57c0a83f9cabc476ca0045c0089195c894b81
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash
drivers/mtd/cfi_flash.c