git.kernelconcepts.de Git - karo-tx-uboot.git/commit

]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit

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
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

33 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
board/freescale/mx35pdk/mx35pdk.c	diff1 \|	diff2 \|	blob \| history
board/samsung/trats/trats.c	diff1 \|	diff2 \|	blob \| history
board/samsung/universal_c210/universal.c	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
common/lcd.c	diff1 \|	diff2 \|	blob \| history
common/main.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/tegra_mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/power/power_fsl.c	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
include/configs/mx31pdk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx35pdk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx51_efikamx.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx51evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx53evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx53loco.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6qarm2.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6qsabre_common.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6qsabrelite.h	diff1 \|	diff2 \|	blob \| history
include/configs/s5pc210_universal.h	diff1 \|	diff2 \|	blob \| history
include/configs/seaboard.h	diff1 \|	diff2 \|	blob \| history
include/configs/tegra-common-post.h	diff1 \|	diff2 \|	blob \| history
include/configs/tegra20-common.h	diff1 \|	diff2 \|	blob \| history
include/configs/trats.h	diff1 \|	diff2 \|	blob \| history
include/configs/ventana.h	diff1 \|	diff2 \|	blob \| history
include/configs/vision2.h	diff1 \|	diff2 \|	blob \| history
include/fdtdec.h	diff1 \|	diff2 \|	blob \| history
include/lcd.h	diff1 \|	diff2 \|	blob \| history
include/power/max8998_pmic.h	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	diff1 \|	diff2 \|	blob \| history
spl/Makefile	diff1 \|	diff2 \|	blob \| history

UBoot for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
board/freescale/mx35pdk/mx35pdk.c	diff1 \|	diff2 \|	blob \| history
board/samsung/trats/trats.c	diff1 \|	diff2 \|	blob \| history
board/samsung/universal_c210/universal.c	diff1 \|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
common/lcd.c	diff1 \|	diff2 \|	blob \| history
common/main.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/tegra_mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/power/power_fsl.c	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
include/configs/mx31pdk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx35pdk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx51_efikamx.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx51evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx53evk.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx53loco.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6qarm2.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6qsabre_common.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6qsabrelite.h	diff1 \|	diff2 \|	blob \| history
include/configs/s5pc210_universal.h	diff1 \|	diff2 \|	blob \| history
include/configs/seaboard.h	diff1 \|	diff2 \|	blob \| history
include/configs/tegra-common-post.h	diff1 \|	diff2 \|	blob \| history
include/configs/tegra20-common.h	diff1 \|	diff2 \|	blob \| history
include/configs/trats.h	diff1 \|	diff2 \|	blob \| history
include/configs/ventana.h	diff1 \|	diff2 \|	blob \| history
include/configs/vision2.h	diff1 \|	diff2 \|	blob \| history
include/fdtdec.h	diff1 \|	diff2 \|	blob \| history
include/lcd.h	diff1 \|	diff2 \|	blob \| history
include/power/max8998_pmic.h	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	diff1 \|	diff2 \|	blob \| history
spl/Makefile	diff1 \|	diff2 \|	blob \| history