diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
| commit | a10a31ec91ad2ee514a42baea9314553aa972676 (patch) | |
| tree | 4fa6eff1efde896343c455854b5c78b2b91bd9e9 /drivers/misc/mxc_ocotp.c | |
| parent | 2372b0012925f9100980151f4a28347c82feaba8 (diff) | |
| parent | 1e6fb0e367564d427d7c57fa7b3b972ecb7147a3 (diff) | |
| download | talos-obmc-uboot-a10a31ec91ad2ee514a42baea9314553aa972676.tar.gz talos-obmc-uboot-a10a31ec91ad2ee514a42baea9314553aa972676.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
Diffstat (limited to 'drivers/misc/mxc_ocotp.c')
0 files changed, 0 insertions, 0 deletions
