]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged
authorAllen Martin <amartin@nvidia.com>
Wed, 19 Dec 2012 21:02:36 +0000 (13:02 -0800)
committerAllen Martin <amartin@nvidia.com>
Wed, 19 Dec 2012 21:02:36 +0000 (13:02 -0800)
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


No differences found