"mrproper" target broken on IK 3.3

[Kalle Vahlman]

Here's what happens with current

igloo-kernel$ LANG=C make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- mrproper
/work/igloo/sources/igloo-kernel/Documentation/DocBook/Makefile:25: /work/igloo/sources/igloo-kernel/Documentation/DocBook/media/Makefile: No such file or directory
make[2]: *** No rule to make target `/work/igloo/sources/igloo-kernel/Documentation/DocBook/media/Makefile'. Stop.
make[1]: *** [Documentation/DocBook] Error 2
make: *** [_clean_Documentation] Error 2

After that 'git status' shows that the media/ dir has been obliterated.

I believe this is an upstream bug, but people with non-debian buildsystems are tripping on this and it would be nice to get a fix included.

[Anmar Oueja (anmar)]

Notice how the linux-igloo-kernel-stable-ubuntu-ux500-3.2 is compiling fine (https://ci.linaro.org/jenkins/view/Linux%20Linaro%20Snowball%20builds/)

I think it is a very simple bug fix and it is making our ci loop look like it is failing all the time.

[Philippe Langlais (philang)]

This is due to a merge problem after mainline has renamed media.tmpl file into media_api.tmpl.
Now fix bug is fixed in 3.3.