From: Wolfgang Denk Date: Wed, 12 Oct 2011 20:47:15 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-mips X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=d8fffa057c9430fd0c5104ab6ff7db4cdb03db51;p=u-boot.git 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 --- d8fffa057c9430fd0c5104ab6ff7db4cdb03db51