Commits
![Albert ARIBAUD](https://secure.gravatar.com/avatar/b210f28e181b9eedfd05efda3b3461c6.jpg?s=96&d=mm)
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: drivers/spi/tegra20_sflash.c include/fdtdec.h lib/fdtdec.c
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: drivers/spi/tegra20_sflash.c include/fdtdec.h lib/fdtdec.c