]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aaf5e82 d8b57c0)
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 patch | diff1 | diff2 | blob | history

diff --cc drivers/mtd/cfi_flash.c
Simple merge
"Das U-Boot" Source Tree