• Mark Brown's avatar
    Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android · bb0dddf6
    Mark Brown authored
    Conflicts:
    	arch/arm64/Kconfig
    	arch/arm64/crypto/Makefile
    	arch/arm64/crypto/aes-glue.c
    	arch/arm64/crypto/ghash-ce-core.S
    	arch/arm64/crypto/ghash-ce-glue.c
    	arch/arm64/include/asm/ptrace.h
    	arch/arm64/include/asm/thread_info.h
    	arch/arm64/kernel/fpsimd.c
    	crypto/ablk_helper.c
    	drivers/base/cpu.c
    	drivers/hid/hid-core.c
    	net/ipv4/raw.c
    bb0dddf6
seq_file.c 20.3 KB