tree 2e98334405e9a602441091317ae69e09c32d3d51
parent 0dd78fb9430e57ccc8e63369c6082b1c730f8aeb
parent 3c945542dad99b1ec4a324ad6b69b8de8829827b
author Wolfgang Denk <wd@denx.de> 1318452435 +0200
committer Wolfgang Denk <wd@denx.de> 1318452435 +0200

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

* '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