]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://git.denx.de/u-boot into resolve
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 10 Dec 2012 04:44:41 +0000 (13:44 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 10 Dec 2012 05:13:27 +0000 (14:13 +0900)
commit2c601c7208713ba9b2158c57adcf515f4bdbc212
tree9f6e70f33565beceb956b98c261bee19731d50d2
parentb8a7c467960ffb4d5a5e1eef5f7783fb6f594542
parentfd4d564b3c80b111f18c93adb14233a6a7ddb0e9
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
33 files changed:
MAINTAINERS
Makefile
board/freescale/mx35pdk/mx35pdk.c
board/samsung/trats/trats.c
board/samsung/universal_c210/universal.c
boards.cfg
common/Makefile
common/lcd.c
common/main.c
drivers/mmc/tegra_mmc.c
drivers/power/power_fsl.c
drivers/video/Makefile
include/configs/mx31pdk.h
include/configs/mx35pdk.h
include/configs/mx51_efikamx.h
include/configs/mx51evk.h
include/configs/mx53evk.h
include/configs/mx53loco.h
include/configs/mx6qarm2.h
include/configs/mx6qsabre_common.h
include/configs/mx6qsabrelite.h
include/configs/s5pc210_universal.h
include/configs/seaboard.h
include/configs/tegra-common-post.h
include/configs/tegra20-common.h
include/configs/trats.h
include/configs/ventana.h
include/configs/vision2.h
include/fdtdec.h
include/lcd.h
include/power/max8998_pmic.h
lib/fdtdec.c
spl/Makefile