Merge git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Wed, 13 Jan 2016 23:03:05 +0000 (18:03 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 14 Jan 2016 02:05:16 +0000 (21:05 -0500)
1  2 
common/fdt_support.c
drivers/net/e1000.c

Simple merge
Simple merge