Merge branch 'master' of git://git.denx.de/u-boot-net

author Tom Rini <trini@konsulko.com>

Thu, 29 Oct 2015 20:30:33 +0000 (16:30 -0400)

committer Tom Rini <trini@konsulko.com>

Thu, 29 Oct 2015 20:30:33 +0000 (16:30 -0400)
author Tom Rini <trini@konsulko.com>
Thu, 29 Oct 2015 20:30:33 +0000 (16:30 -0400)
committer Tom Rini <trini@konsulko.com>
Thu, 29 Oct 2015 20:30:33 +0000 (16:30 -0400)
diff --cc README
Simple merge
diff --cc drivers/usb/eth/smsc95xx.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Thu, 29 Oct 2015 20:30:33 +0000 (16:30 -0400)
committer	Tom Rini <trini@konsulko.com>
	Thu, 29 Oct 2015 20:30:33 +0000 (16:30 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/eth/smsc95xx.c	patch \|	diff1 \|	diff2 \|	blob \| history