diff options
| author | Anatolij Gustschin <agust@denx.de> | 2013-03-29 13:54:10 +0100 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-03-29 13:54:10 +0100 |
| commit | d0f34f10f14853ebe3f75371533708aa0639d830 (patch) | |
| tree | 5e6bf57ff36e9e52c1a3d78a083883eca73978c4 /include/altera.h | |
| parent | 009d75ccc11d27b9a083375a88bb93cb746b4800 (diff) | |
| parent | acf3baad23586bcaf9af608b8c31949ab54e8338 (diff) | |
| download | u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.zip u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.tar.gz u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.tar.bz2 | |
Merge branch 'for-v2013.04'
Conflicts:
drivers/video/Makefile
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include/altera.h')
0 files changed, 0 insertions, 0 deletions