From: Tom Rini <trini@konsulko.com>
Date: Mon, 26 Sep 2016 17:24:46 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-fsl-qoriq
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cbe7706ab8aab06c18edaa9b120371f9c8012728;p=project%2Fbcm63xx%2Fu-boot.git

Merge git://git.denx.de/u-boot-fsl-qoriq

trini: Drop local memset() from
examples/standalone/mem_to_mem_idma2intr.c

Signed-off-by: Tom Rini <trini@konsulko.com>
---

cbe7706ab8aab06c18edaa9b120371f9c8012728
diff --cc examples/standalone/mem_to_mem_idma2intr.c
index 17da8db9b9,17da8db9b9..ce6e6c4a10
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@@ -186,13 -186,13 +186,6 @@@ int ctrlc (void
  	}
  	return 0;
  }
--void * memset(void * s,int c,size_t count)
--{
--	char *xs = (char *) s;
--	while (count--)
--		*xs++ = c;
--	return s;
--}
  int memcmp(const void * cs,const void * ct,size_t count)
  {
  	const unsigned char *su1, *su2;