git.librecmc.org Git - oweals/u-boot.git/commit - board/ttcontrol/vision2/vision2.c

author	Allen Martin <amartin@nvidia.com>
	Wed, 19 Dec 2012 21:02:36 +0000 (13:02 -0800)
committer	Allen Martin <amartin@nvidia.com>
	Wed, 19 Dec 2012 21:02:36 +0000 (13:02 -0800)
commit	a098cf41fdb2a6607c675f7fe4f3164617c9367e
tree	b37acb36f65909e6f74cc537d73efd883a1485a6	tree \| snapshot
parent	b8a7c467960ffb4d5a5e1eef5f7783fb6f594542	commit \| diff
parent	095728803eedfce850a2f85828f79500cb09979e	commit \| diff

Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

Conflicts:
README
arch/arm/cpu/armv7/exynos/clock.c
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

40 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/exynos/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/exynos/pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-exynos/cpu.h	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/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/tegra_mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/power/power_fsl.c	\|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
include/configs/mx28evk.h	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/smdk5250.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	\|	diff2 \|	blob \| history
lib/fdtdec.c	diff1 \|	diff2 \|	blob \| history
spl/Makefile	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/exynos/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/exynos/pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-exynos/cpu.h	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/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/tegra_mmc.c	diff1 \|	diff2 \|	blob \| history
drivers/power/power_fsl.c	\|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
include/configs/mx28evk.h	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/smdk5250.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	\|	diff2 \|	blob \| history
lib/fdtdec.c	diff1 \|	diff2 \|	blob \| history
spl/Makefile	diff1 \|	diff2 \|	blob \| history