tree 3b6f5c72fe60de068051189fd1d74962c2a147e7
parent ad3b5fb772e6a824f1ac341eb8e392eca6fc524f
author Thomas Gleixner <tglx@cruncher.tec.linutronix.de> 1150474209 +0200
committer David Woodhouse <dwmw2@infradead.org> 1150831883 +0100

[MTD] NAND Fixup NDFC merge brokeness

Remove the remains of a broken merge.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>