diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 09:15:26 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-05 09:15:26 (GMT) |
| commit | 19d829fa60fc4e6df514a046142faaaf9fc8185d (patch) | |
| tree | 295c75b0d9f3c7180f23ec131442286cf91db5b1 /arch/powerpc/include/asm/ppc4xx.h | |
| parent | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (diff) | |
| parent | 8467faef7fce8c5faad7224b7737a58e16c52186 (diff) | |
| download | u-boot-19d829fa60fc4e6df514a046142faaaf9fc8185d.tar.xz | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/serial.c
The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.
Diffstat (limited to 'arch/powerpc/include/asm/ppc4xx.h')
0 files changed, 0 insertions, 0 deletions