Merge tag 'lsk-v3.10-15.04-android'

Conflicts:
	drivers/base/cpu.c
	drivers/misc/Kconfig
	drivers/misc/Makefile

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kernel/setup.c
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc drivers/base/cpu.c
index 4200ca5e36a819569e7f08536708eef9c7f576b8,607efe6b7dc84609b50d3fc0f3b1694a420dfbdd..7acaf9a57a4f3838b3d8b1299803094b6b0ecf30
--- 1/drivers/base/cpu.c
--- 2/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@@ -319,8 -319,7 +319,8 @@@ int __cpuinit register_cpu(struct cpu *
        cpu->dev.id = num;
        cpu->dev.bus = &cpu_subsys;
        cpu->dev.release = cpu_device_release;
- #ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
 +      cpu->dev.of_node = of_get_cpu_node(num, NULL);
+ #ifdef CONFIG_HAVE_CPU_AUTOPROBE
        cpu->dev.bus->uevent = cpu_uevent;
  #endif
        error = device_register(&cpu->dev);

diff --cc drivers/misc/Kconfig
index e25c8bbfa57086c7497866018a74ce8d80cbeb70,181fc59fec04f9926426789abdbc6afbbc3eab51..fc5fe5926c3fcd912e87af1e2644432251f8cc45
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -531,14 -531,12 +531,20 @@@ config SRA
          the genalloc API. It is supposed to be used for small on-chip SRAM
          areas found on many SoCs.
  
+ config UID_CPUTIME
+       tristate "Per-UID cpu time statistics"
+       depends on PROFILING
+       help
+         Per UID based cpu time statistics exported to /proc/uid_cputime
+ 
 +config 5V_EN
 +      bool "5v en power control for otg and hdmi"
 +      default y
 +      help
 +        This driver is control enable 5v power when startup and disable it
 +        when suspend and no insert otg. if your board is control this power
 +        by a gpio please select it. 
 +
  source "drivers/misc/c2port/Kconfig"
  source "drivers/misc/eeprom/Kconfig"
  source "drivers/misc/cb710/Kconfig"

diff --cc drivers/misc/Makefile
index c78c5d78653b1b589946c2a14514915328e52e4b,89435c9a182c4d348cab3cf9424d46f03179173f..fae4038627fb53d15436de23ea82db7717e220a0
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -53,7 -53,5 +53,8 @@@ obj-$(CONFIG_ALTERA_STAPL)    +=altera-sta
  obj-$(CONFIG_INTEL_MEI)               += mei/
  obj-$(CONFIG_VMWARE_VMCI)     += vmw_vmci/
  obj-$(CONFIG_LATTICE_ECP3_CONFIG)     += lattice-ecp3-config.o
 +obj-y += inv_mpu/
  obj-$(CONFIG_SRAM)            += sram.o
+ obj-$(CONFIG_UID_CPUTIME) += uid_cputime.o
 +
 +obj-$(CONFIG_5V_EN)   += 5v_en.o

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/usb/gadget/android.c
index 8027ec940f96a571a0806a7bf1045a9826406789,61c5e582bf473d447db995b7b271750cb0248265..f1264747677ece818c56d4319a68043b4089d1a8
mode 100755,100644..100755
--- 1/drivers/usb/gadget/android.c
--- 2/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@@ -48,9 -49,15 +49,15 @@@ MODULE_VERSION("1.0")
  static const char longname[] = "Gadget Android";
  
  /* Default vendor and product IDs, overridden by userspace */
 -#define VENDOR_ID             0x18D1
 -#define PRODUCT_ID            0x0001
 +#define VENDOR_ID             0x2207
 +#define PRODUCT_ID            0x2910
  
+ /* f_midi configuration */
+ #define MIDI_INPUT_PORTS    1
+ #define MIDI_OUTPUT_PORTS   1
+ #define MIDI_BUFFER_SIZE    256
+ #define MIDI_QUEUE_LENGTH   32
+ 
  struct android_usb_function {
        char *name;
        void *config;