UBI: fix and re-work debugging stuff

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --cc drivers/mtd/ubi/build.c
Simple merge

diff --cc drivers/mtd/ubi/cdev.c
Simple merge

diff --cc drivers/mtd/ubi/debug.c
Simple merge

diff --cc drivers/mtd/ubi/debug.h
Simple merge

diff --cc drivers/mtd/ubi/gluebi.c
Simple merge

diff --cc drivers/mtd/ubi/io.c
Simple merge

diff --cc drivers/mtd/ubi/kapi.c
Simple merge

diff --cc drivers/mtd/ubi/scan.c
Simple merge

diff --cc drivers/mtd/ubi/upd.c
Simple merge

diff --cc drivers/mtd/ubi/vmt.c
Simple merge

diff --cc drivers/mtd/ubi/vtbl.c
Simple merge