tree 12abe9fcf437d58b73ee1fa8d422548560deaae5
parent e3b2c6f431795ca4d1439eb58664e02bcf64bfd0
parent 59dd8b5303c0deccecee5e3aa7f2937536f64e7f
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1364493001 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1364493001 +0100

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	drivers/spi/tegra20_sflash.c
	include/fdtdec.h
	lib/fdtdec.c