diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-06 14:06:03 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-06 14:06:03 +0200 |
| commit | 1318673045fe188c6e24c582b1e6efc00ae1c62c (patch) | |
| tree | 7d427072e01e415247c2bca9a6970e9901de66ac /include/asm-ppc | |
| parent | f2302d4430e7f3f48308d6a585320fe96af8afbd (diff) | |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/asm-ppc')
0 files changed, 0 insertions, 0 deletions