From: Wolfgang Denk <wd@denx.de>
Date: Wed, 12 Oct 2011 20:43:54 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
X-Git-Tag: v2011.12-rc1~538
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e5a07171767115b446fb5070e9c0293fd1190c03;p=oweals%2Fu-boot.git

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

e5a07171767115b446fb5070e9c0293fd1190c03