a48ecc969f
Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>