Merge branch 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux...