Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:16:02 +0000 (23:16 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Dec 2010 22:16:02 +0000 (23:16 +0100)
commitb06b1633f5d0c78b7ec2bb1360cfd7837df1d864
tree79dcc8862fc8c38a3b040dca7e0252bfdf4558fc
parentb5d58d8500bfb918c7fec56f241e6ee1078c2be0
parent767589a7b2668ea1eb6c0b80e432b2953b9928bc
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash