Merge with /home/wd/git/u-boot/master

diff --git a/net/bootp.c b/net/bootp.c
index 8f1382e9457b70348080a1b669cc64ba32eda391..1de9a8f2c6aab435182e3e9df23de893978ec9cb 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -851,7 +851,7 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer)
        NetCopyIP(&bp->bp_ciaddr, &bp_offer->bp_ciaddr); /* both in network byte order */
        NetCopyIP(&bp->bp_yiaddr, &bp_offer->bp_yiaddr);
        NetCopyIP(&bp->bp_siaddr, &bp_offer->bp_siaddr);
-       /* 
+       /*
         * RFC3046 requires Relay Agents to discard packets with
         * nonzero and offered giaddr
         */