Merge remote-tracking branch 'lsk/v3.10/topic/arm64-insn' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 20 May 2014 12:03:38 +0000 (13:03 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 20 May 2014 12:03:38 +0000 (13:03 +0100)
commit0ae60b6553a4933483ac32247bcc0cfb313fd48f
tree5ee80eed0530e206bb9955e8d6d2d14593000b85
parent07e790e40c45b6e7927b88a81fc78c9242a672e9
parentd6e6ff5d209e801eea5e519596fa6de9b3145418
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-insn' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/Makefile
arch/arm64/kernel/module.c
arch/arm64/Kconfig
arch/arm64/kernel/Makefile