[PATCH] nand: Fix patch merge problem
authorStefan Roese <sr@denx.de>
Tue, 28 Nov 2006 10:04:45 +0000 (11:04 +0100)
committerStefan Roese <sr@denx.de>
Tue, 28 Nov 2006 10:04:45 +0000 (11:04 +0100)
commit58e3b14c18ed3288ceef8d086946dbf3df64ccf2
tree71ef288055d446ec1ba4780e8c6bcdd9e5508169
parentd2c83f549378fb3fc34cb3c2e62fd772fbf8b68b
[PATCH] nand: Fix patch merge problem

Signed-off-by: Stefan Roese <sr@denx.de>
drivers/nand/nand_base.c