Merge 'common/android-3.10' into android-goldfish-3.10

*
|\
| * 88835a3 2014-09-24 Badhri@google.com USB: f_rndis: fix compile error
| * 12407bb 2014-09-04 xerox_lin@htc.com USB: gadget: rndis: Add module parameter for DL max packets per xfer
| * 5cf9479 2014-09-18 Badhri@google.com ndis: Add debug support to disable RNDIS Multipacket Feature
| * f9039de 2014-09-18 Badhri@google.com RNDIS: Add Data aggregation (multi packet) support
| * 91da92a 2014-09-18 Badhri@google.com USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode
| * 9c861db 2012-09-14 taeju.park@lge.com usb: gadget: prevent change of Host MAC address of 'usb0' interface
| * 555f3ed 2014-09-24 Badhri@google.com usb: u_ether: Add workqueue as bottom half handler for rx data path
| * f884d7f 2014-09-17 jpa@google.com arm64: Fixup __NR_* compat syscalls count.
| * ba27127 2014-04-30 takahiro.akashi@linaro.org arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h
| * 4b373563 2014-04-30 takahiro.akashi@linaro.org arm64: Add regs_return_value() in syscall.h
| * 3e21c0b 2014-09-17 jpa@google.com arm64: audit: Add audit hook in syscall_trace_enter/exit()
| * bf11863 2014-07-04 takahiro.akashi@linaro.org arm64: Add audit support
| * 4f2f36a 2013-08-28 alonid@stratoscale.com Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
| * cfc7e99e9 2014-09-17 jpa@google.com arm64: Add __NR_* definitions for compat syscalls
| * 26108f2 2014-04-30 takahiro.akashi@linaro.org arm64: split syscall_trace() into separate functions for enter/exit
| * f91c274 2014-04-30 takahiro.akashi@linaro.org arm64: make a single hook to syscall_trace() for all syscall features
| * 4149e0d 2014-09-17 jpa@google.com seccomp: revert previous patches in prep for updated ones
| * 8fdfc48 2013-09-02 catalin.marinas@arm.com arm64: Remove unused cpu_name ascii in arch/arm64/mm/proc.S
| * eaa22ea 2013-12-16 ard.biesheuvel@linaro.org arm64: drop redundant macros from read_cpuid()
| * 39fdc30 2014-09-15 ghackmann@google.com android: base-cfg: enable ARMV7_COMPAT

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/kernel/hw_breakpoint.c

Signed-off-by: JP Abgrall <jpa@google.com>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
index f2a52a51f904558205edfe21ce231b3f76e5aa5d,2221396c2a6c097eaf13847337000caf3a6c679e..ce7d178a30eb726818f9b7b089366ba7c37a810a
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -9,11 -7,9 +9,12 @@@ config ARM6
        select ARM_AMBA
        select ARM_ARCH_TIMER
        select ARM_GIC
+       select AUDIT_ARCH_COMPAT_GENERIC
 +      select BUILDTIME_EXTABLE_SORT
        select CLONE_BACKWARDS
        select COMMON_CLK
 +      select CPU_PM if (SUSPEND || CPU_IDLE)
 +      select DCACHE_WORD_ACCESS
        select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_CPU_AUTOPROBE
@@@ -22,12 -17,9 +23,13 @@@
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
        select GENERIC_SMP_IDLE_THREAD
 +      select GENERIC_STRNCPY_FROM_USER
 +      select GENERIC_STRNLEN_USER
        select GENERIC_TIME_VSYSCALL
        select HARDIRQS_SW_RESEND
+       select HAVE_ARCH_AUDITSYSCALL
 +      select HAVE_ARCH_KGDB
 +      select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DEBUG_KMEMLEAK

diff --cc arch/arm64/include/asm/ptrace.h
Simple merge

diff --cc arch/arm64/include/asm/syscall.h
Simple merge

diff --cc arch/arm64/include/asm/thread_info.h
Simple merge

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/hw_breakpoint.c
index b989233a9d3178673a4f5317eaa50eb612937209,68e371ea1bdae794e3da5636f00677cb513986ea..6de3460ede4c9060abc248ce6f1fbe28e81ecf70
--- 1/arch/arm64/kernel/hw_breakpoint.c
--- 2/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@@ -20,7 -20,7 +20,8 @@@
  
  #define pr_fmt(fmt) "hw-breakpoint: " fmt
  
+ #include <linux/compat.h>
 +#include <linux/cpu_pm.h>
  #include <linux/errno.h>
  #include <linux/hw_breakpoint.h>
  #include <linux/perf_event.h>

diff --cc arch/arm64/kernel/kuser32.S
Simple merge

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

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

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

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