Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Tue, 17 Mar 2015 21:59:05 +0000 (21:59 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 17 Mar 2015 21:59:05 +0000 (21:59 +0000)
commit43e7406efd7822d75c64310461d2cbca0ece19f0
tree22a7e030ac75c7db2b767292c59c9a36bb810c9c
parent42f504e28a169ebfea0e3d9c6e151451800e41d5
parent3d95e2f8f6c3666ffb3f5aee405ecc15a14ea570
Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk

Conflicts:
arch/arm64/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/microblaze/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig
include/asm-generic/vmlinux.lds.h
kernel/module.c