summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-28 12:48:47 +0200
committerWolfgang Denk <wd@denx.de>2008-04-28 12:48:47 +0200
commitf2c288a35341ad02ac03b1563d786763c9c8f159 (patch)
tree75819bc39422c6f54f20a7d93b80f7508e3b3429 /common
parent4ca79f477ebd25a6872e6196d80e2f5eff441376 (diff)
downloadu-boot-imx-f2c288a35341ad02ac03b1563d786763c9c8f159.zip
u-boot-imx-f2c288a35341ad02ac03b1563d786763c9c8f159.tar.gz
u-boot-imx-f2c288a35341ad02ac03b1563d786763c9c8f159.tar.bz2
pcnet.c: fix a merge issue
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common')
0 files changed, 0 insertions, 0 deletions