Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Wed, 12 Oct 2011 20:43:54 +0000 (22:43 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 12 Oct 2011 20:43:54 +0000 (22:43 +0200)
commite5a07171767115b446fb5070e9c0293fd1190c03
tree70cfb4b26418d51b870d567f6578621843348ef1
parent37eefe80bb3f1cc25dc8b10f2b7d0b8077e60e09
parent60161943719c4054453f6932ad2bd5fe2285bf1b
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

* 'master' of git://git.denx.de/u-boot-nand-flash:
  NAND: davinci: choose correct 1-bit h/w ECC reg