Merge branch 'u-boot/master'

Conflicts:
	drivers/net/Makefile

(trivial merge)
This commit is contained in:
Albert ARIBAUD
2014-05-09 10:47:05 +02:00
443 changed files with 9779 additions and 38614 deletions

View File

@@ -6,5 +6,5 @@
# SPDX-License-Identifier: GPL-2.0+
#
obj-y += $(BOARD).o
obj-y += cm_t335.o
obj-$(CONFIG_SPL_BUILD) += mux.o spl.o