Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 20 Feb 2015 05:29:33 +0000 (14:29 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 20 Feb 2015 05:29:33 +0000 (14:29 +0900)
commitdef31719e14fb7866fa243c453393ca7b90cca73
treeea649cfa349743537273675c17de8353d8a3f11b
parent0fa60a2e6ac995035e785a817982679ff4cb4d7f
parent855267e97aab7a25fb3aaa27f8080a0792fb3011
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
drivers/Kconfig
drivers/Makefile
fs/pstore/inode.c
fs/pstore/ram.c
16 files changed:
arch/arm/Kconfig
arch/arm/crypto/aes_glue.c
arch/arm/crypto/sha1_glue.c
drivers/Kconfig
drivers/Makefile
drivers/staging/android/logger.c
fs/pstore/inode.c
fs/pstore/ram.c
include/linux/pstore_ram.h
include/net/addrconf.h
include/uapi/linux/Kbuild
kernel/irq/pm.c
net/ipv6/addrconf.c
net/netfilter/xt_qtaguid.c
security/selinux/hooks.c
security/selinux/ss/policydb.c