From: Wolfgang Denk Date: Thu, 3 Nov 2011 19:35:45 +0000 (+0100) Subject: Merge branch 'master' of git://git.denx.de/u-boot-nds32 X-Git-Tag: v2011.12-rc1~335 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2b4449aa7fcbf2b3042cd9100f5857d89480812;p=platform%2Fkernel%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot-nds32 * 'master' of git://git.denx.de/u-boot-nds32: nds32: asm/io.h: add __iormb __iowmb and inline io support nds32: cache: define ARCH_DMA_MINALIGN for DMA buffer alignment nds32: Use getenv_ulong() in place of getenv(), strtoul --- b2b4449aa7fcbf2b3042cd9100f5857d89480812