Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Wed, 12 Oct 2011 20:47:15 +0000 (22:47 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 12 Oct 2011 20:47:15 +0000 (22:47 +0200)
* 'master' of git://git.denx.de/u-boot-mips:
  MIPS: Jz4740: Add qi_lb60 board support
  MIPS: Jz4740: Add NAND driver
  MIPS: Ingenic XBurst Jz4740 processor support

1  2 
README

diff --cc README
Simple merge