Merge branch 'u-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 28 Mar 2013 17:50:01 +0000 (18:50 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 28 Mar 2013 17:50:01 +0000 (18:50 +0100)
commit009d75ccc11d27b9a083375a88bb93cb746b4800
tree12abe9fcf437d58b73ee1fa8d422548560deaae5
parent417c55803118eb8e350d5ab8ba6583fb39f4e2e3
parentd53e340edf65ff253d3a7b06ebe60501045892e3
Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
drivers/spi/tegra20_sflash.c
include/fdtdec.h
lib/fdtdec.c
MAINTAINERS
drivers/mtd/spi/winbond.c
drivers/spi/Makefile
drivers/spi/tegra20_sflash.c
drivers/spi/tegra20_slink.c
include/fdtdec.h
lib/fdtdec.c