Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Thu, 7 Jun 2012 21:38:54 +0000 (23:38 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 7 Jun 2012 21:38:54 +0000 (23:38 +0200)
* 'master' of git://git.denx.de/u-boot-mips:
  MIPS: board.c: move extern declarations to u-boot-mips.h
  MIPS: bootm_qemu_mips.c: make checkpatch.pl clean
  MIPS: bootm.c: make checkpatch.pl clean

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

Trivial merge