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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/crypto/aes_glue.c
Simple merge

diff --cc arch/arm/crypto/sha1_glue.c
Simple merge

diff --cc drivers/Kconfig
index ba3c789ad9b82ecf9e62061e0050616ffac3c5f9,f1a95063c257543d37c82c911c61f0a21279a175..4f990ce9515ac28f7fb010ec9ff64bd2fa5f9ac4
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -168,6 -168,6 +168,8 @@@ source "drivers/ipack/Kconfig
  
  source "drivers/reset/Kconfig"
  
 +source "drivers/gator/Kconfig"
 +
+ source "drivers/android/Kconfig"
+ 
  endmenu

diff --cc drivers/Makefile
index 65ac273d67be7acc0f9a13cf43c97286e3ac4ebe,fe5799aa509130080cbe8e5cb6fffcd8c4286f64..3774b56c5d80c3dc961479ba1f9e5eff85c6ea20
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -153,6 -153,4 +153,7 @@@ obj-$(CONFIG_IIO)          += iio
  obj-$(CONFIG_VME_BUS)         += vme/
  obj-$(CONFIG_IPACK_BUS)               += ipack/
  obj-$(CONFIG_NTB)             += ntb/
 +
 +obj-$(CONFIG_GATOR)           += gator/
 +obj-$(CONFIG_CORESIGHT)               += coresight/
+ obj-$(CONFIG_ANDROID)         += android/

diff --cc drivers/staging/android/logger.c
Simple merge

diff --cc fs/pstore/inode.c
Simple merge

diff --cc fs/pstore/ram.c
index 283bda06cd8c19345336d5e76a3e420bc5a20d9d,3a28d468b458f5e87c97e582421917861d5024ad..f721e47db8ad929fc8eb3911b8eb1b2473a5340e
--- 1/fs/pstore/ram.c
--- 2/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@@ -82,9 -81,9 +86,10 @@@ struct ramoops_context 
        struct persistent_ram_zone **przs;
        struct persistent_ram_zone *cprz;
        struct persistent_ram_zone *fprz;
+       struct persistent_ram_zone *mprz;
        phys_addr_t phys_addr;
        unsigned long size;
 +      unsigned int memtype;
        size_t record_size;
        size_t console_size;
        size_t ftrace_size;

diff --cc include/linux/pstore_ram.h
Simple merge

diff --cc include/net/addrconf.h
Simple merge

diff --cc include/uapi/linux/Kbuild
Simple merge

diff --cc kernel/irq/pm.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/netfilter/xt_qtaguid.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/selinux/ss/policydb.c
Simple merge