Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Mon, 25 Nov 2013 15:42:13 +0000 (10:42 -0500)
committerTom Rini <trini@ti.com>
Mon, 25 Nov 2013 15:42:13 +0000 (10:42 -0500)
commitfaca8ff55f4a2cf45fb906cc37f44601149fc00e
tree181e94fa3326f2ec97f0287f3bbbe54ccd3b13d1
parent5a4fe1aaf1210b02bb98e347993ffbcffeb4ffaa
parent2c17e6d1d996a1b8b9325de15f253a13d5877dee
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
12 files changed:
board/ti/am335x/board.c
include/configs/am335x_evm.h
include/configs/am3517_crane.h
include/configs/am3517_evm.h
include/configs/devkit8000.h
include/configs/mcx.h
include/configs/omap3_beagle.h
include/configs/omap3_igep00x0.h
include/configs/omap3_overo.h
include/configs/siemens-am33x-common.h
include/configs/tam3517-common.h
include/configs/tricorder.h