Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Mon, 30 Jul 2012 08:07:00 +0000 (10:07 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 30 Jul 2012 08:07:00 +0000 (10:07 +0200)
* '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>
1  2 
Makefile

diff --cc Makefile
Simple merge