summaryrefslogtreecommitdiff
path: root/cpu/arm926ejs/davinci/dp83848.c
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2007-08-10 15:34:48 -0500
committerWolfgang Denk <wd@denx.de>2007-08-10 23:34:42 +0200
commitfb56579ffe7ef3275b7036bb7b924e5a0d32bd70 (patch)
tree537faa4c04db58ee7b070b56bd7de7bd116092d3 /cpu/arm926ejs/davinci/dp83848.c
parent2628114ec564f969f34b5f7105fbd168cb8c9c3f (diff)
downloadu-boot-imx-fb56579ffe7ef3275b7036bb7b924e5a0d32bd70.zip
u-boot-imx-fb56579ffe7ef3275b7036bb7b924e5a0d32bd70.tar.gz
u-boot-imx-fb56579ffe7ef3275b7036bb7b924e5a0d32bd70.tar.bz2
make MAKEALL more immune to merge conflicts
..by placing board entries one per line, as suggested by jdl. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'cpu/arm926ejs/davinci/dp83848.c')
0 files changed, 0 insertions, 0 deletions