| commit | 2c601c7208713ba9b2158c57adcf515f4bdbc212 | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Mon Dec 10 13:44:41 2012 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Mon Dec 10 14:13:27 2012 +0900 |
| tree | 9f6e70f33565beceb956b98c261bee19731d50d2 | |
| parent | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 [diff] | |
| parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 [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