Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Fri, 12 Jul 2013 21:18:59 +0000 (17:18 -0400)
committerTom Rini <trini@ti.com>
Fri, 12 Jul 2013 21:18:59 +0000 (17:18 -0400)
commit8d94e6848fcbddb8b2ef17bc3bd8776a03b8cd5d
tree7297992ee4f0356a3d19dc47e318b3acfd8588b2
parentb7a1d13462115d2cafb0a3ffcbdce48c2f78f06e
parent1c903694370259738abccc67ff0d6e5eaf7886f9
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash