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)
commitd8fffa057c9430fd0c5104ab6ff7db4cdb03db51
tree2e98334405e9a602441091317ae69e09c32d3d51
parent0dd78fb9430e57ccc8e63369c6082b1c730f8aeb
parent3c945542dad99b1ec4a324ad6b69b8de8829827b
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
README