tiny conflict resolved
commit7b2159dea86f19bafdaf41f54c44c20051c9b020
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 30 Aug 2005 16:45:00 +0000 (30 16:45 +0000)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 30 Aug 2005 16:45:00 +0000 (30 16:45 +0000)
treeb95af733774ef463e21b5d42ec9c91e720af2e8a
parent86a9bd69ca69d864f639013dffb4fe25743114a7
tiny conflict resolved

darcs-hash:20050830164532-f2ef6-a33dbc605c0231572ac4283f0044e1fa0ac5625a.gz
arch/arm/mach-lpc2106/tools/tolpc/tolpc_fn.c