From: Mark Brown <broonie@kernel.org>
Date: Fri, 20 Feb 2015 05:29:33 +0000 (+0900)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=def31719e14fb7866fa243c453393ca7b90cca73;p=firefly-linux-kernel-4.4.55.git

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
---

def31719e14fb7866fa243c453393ca7b90cca73
diff --cc drivers/Kconfig
index ba3c789ad9b8,f1a95063c257..4f990ce9515a
--- a/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 65ac273d67be,fe5799aa5091..3774b56c5d80
--- a/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 fs/pstore/ram.c
index 283bda06cd8c,3a28d468b458..f721e47db8ad
--- a/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;