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

* 'master' of git://git.denx.de/u-boot-mips:
  MIPS: fix renaming of inca-swap-bytes to xway-swap-bytes

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --combined Makefile
index 4356b227e3eaa7f3e91b8f087fd800ee367be4af,013d139888b3adb2cfa093373424175e5baea830..32a8bab7cad28086346655756c2d9ad99e8e1c12
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -617,7 -617,7 +617,7 @@@ $(obj)lib/asm-offsets.s:   $(obj)include/
  
  $(obj)include/generated/asm-offsets.h:        $(obj)include/autoconf.mk.dep \
        $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
 -      @echo Generating $@
 +      @$(XECHO) Generating $@
        tools/scripts/make-asm-offsets $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s $@
  
  $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep
@@@ -792,7 -792,7 +792,7 @@@ clobber:   tid
        @rm -f $(obj)u-boot.dtb
        @rm -f $(obj)u-boot.sb
        @rm -f $(obj)u-boot.spr
-       @rm -f $(obj)tools/inca-swap-bytes
+       @rm -f $(obj)tools/xway-swap-bytes
        @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
        @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c
        @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm