]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 348e47f b9e31be)
Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
committerTom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
1  2 
README patch | diff1 | diff2 | blob | history
drivers/mtd/spi/spi_flash.c patch | diff1 | diff2 | blob | history
drivers/mtd/spi/spi_flash_internal.h patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc drivers/mtd/spi/spi_flash.c
Simple merge
diff --cc drivers/mtd/spi/spi_flash_internal.h
Simple merge
Cloned from git://git.denx.de/u-boot.git