Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 20:44:46 +0000 (21:44 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 4 Feb 2011 20:44:46 +0000 (21:44 +0100)
commitf69b980d108b5f15ca7dd3f4284d5a66488c3625
treee27e59b03e0fbd2346ebe49ad7f8dd5f4d982215
parent4bfa18fb99e4ffa9451d9ec95375a5e970847bf8
parent920a5dd2325438a82b6ac8102c5ea5e0c43276fd
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash