Some changes didn't went ok to -git, probably due to changes at merging
patches.
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>