Merge git://git.denx.de/u-boot-net

author Tom Rini <trini@konsulko.com>

Wed, 13 Jan 2016 23:03:05 +0000 (18:03 -0500)

committer Tom Rini <trini@konsulko.com>

Thu, 14 Jan 2016 02:05:16 +0000 (21:05 -0500)
author Tom Rini <trini@konsulko.com>
Wed, 13 Jan 2016 23:03:05 +0000 (18:03 -0500)
committer Tom Rini <trini@konsulko.com>
Thu, 14 Jan 2016 02:05:16 +0000 (21:05 -0500)
diff --cc common/fdt_support.c
Simple merge
diff --cc drivers/net/e1000.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Wed, 13 Jan 2016 23:03:05 +0000 (18:03 -0500)
committer	Tom Rini <trini@konsulko.com>
	Thu, 14 Jan 2016 02:05:16 +0000 (21:05 -0500)
		1	2
common/fdt_support.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000.c	patch \|	diff1 \|	diff2 \|	blob \| history