diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-08 14:35:10 +0200 |
| commit | 10e167329b029890a4c704f094822da5f259b886 (patch) | |
| tree | c0950b7cb928ee26b07c39348e4539602ce3aec9 /arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h | |
| parent | dbc000bfb51eb30d786521e6b8e29048c36cbefa (diff) | |
| parent | 4a1c7b13ae104d4526d3176793b7f6b06694df15 (diff) | |
| download | talos-obmc-uboot-10e167329b029890a4c704f094822da5f259b886.tar.gz talos-obmc-uboot-10e167329b029890a4c704f094822da5f259b886.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/serial/Makefile
Diffstat (limited to 'arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h')
0 files changed, 0 insertions, 0 deletions
