diff options
| author | Minkyu Kang <[email protected]> | 2010-05-10 15:20:50 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-05-10 15:20:50 +0900 |
| commit | 9d62f20d0861ef87460d073dc189c851715b46ae (patch) | |
| tree | 43a05c86e947f01079879735ddf93218870df50b /api | |
| parent | 6596753387c3310b86f75bebe464684d70651052 (diff) | |
| parent | e0531f975ce124f4ebdd9c7b7b107673c5628f68 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/include/asm/mach-types.h
common/serial.c
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'api')
| -rw-r--r-- | api/api_platform-powerpc.c (renamed from api/api_platform-ppc.c) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/api/api_platform-ppc.c b/api/api_platform-powerpc.c index a3d981f9e38..a3d981f9e38 100644 --- a/api/api_platform-ppc.c +++ b/api/api_platform-powerpc.c |