| author | Minkyu Kang <mk7.kang@samsung.com> | |
| Mon, 10 Dec 2012 04:44:41 +0000 (13:44 +0900) | ||
| committer | Minkyu Kang <mk7.kang@samsung.com> | |
| Mon, 10 Dec 2012 05:13:27 +0000 (14:13 +0900) | ||
| commit | 2c601c7208713ba9b2158c57adcf515f4bdbc212 | |
| tree | 9f6e70f33565beceb956b98c261bee19731d50d2 | tree | snapshot (tar.xz tar.gz zip) |
| parent | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 | commit | diff |
| parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 | commit | diff |
Merge branch 'master' of git://git.denx.de/u-boot into resolve
Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
33 files changed: