diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
| commit | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch) | |
| tree | a046b11024bdf0a41082647c95df23a10cb206fc /arch/powerpc/include/asm/4xx_pci.h | |
| parent | d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff) | |
| parent | 28e57108a61bd0e554d9847170b8ad9dad093e07 (diff) | |
| download | u-boot-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.gz u-boot-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.xz u-boot-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts:
include/configs/km_arm.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/powerpc/include/asm/4xx_pci.h')
0 files changed, 0 insertions, 0 deletions