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)
* 'master' of git://git.denx.de/u-boot-nand-flash:
  NAND: davinci: choose correct 1-bit h/w ECC reg


Trivial merge