* android-3.10: (530 commits)
ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
ANDROID: binder: Add strong ref checks
UPSTREAM: staging/android/ion : fix a race condition in the ion driver
UPSTREAM: KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring
UPSTREAM: KEYS: Fix race between key destruction and finding a keyring by name
UPSTREAM: fs,userns: Change inode_capable to capable_wrt_inode_uidgid
BACKPORT: audit: consistently record PIDs with task_tgid_nr()
UPSTREAM: arm64: make sys_call_table const
net: inet: diag: expose the socket mark to privileged processes.
net: diag: make udp_diag_destroy work for mapped addresses.
net: diag: support SOCK_DESTROY for UDP sockets
net: diag: allow socket bytecode filters to match socket marks
net: diag: slightly refactor the inet_diag_bc_audit error checks.
net: diag: Add support to filter on device index
BACKPORT: audit: fix a double fetch in audit_log_single_execve_arg()
UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor
BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7
Revert "BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7 Modern ARMv7-A/R cores optionally implement below new hardware feature:"
Revert "UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor The VMSA field of MMFR0 (bottom 4 bits) is incremented for each added feature. PXN is supported if the value is >= 4 and LPAE is supported if it is >= 5."
UPSTREAM: perf: Fix race in swevent hash
...
Conflicts:
Documentation/ABI/testing/sysfs-block-zram
Documentation/blockdev/zram.txt
Documentation/sysctl/kernel.txt
arch/arm/include/asm/elf.h
arch/arm/kernel/fiq.c
arch/arm/kernel/process.c
arch/arm/kernel/signal.c
arch/arm/kernel/traps.c
arch/arm/mm/Kconfig
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/mm/fault.c
arch/arm64/mm/mmap.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/tls.c
drivers/android/binder.c
drivers/block/zram/zcomp.c
drivers/block/zram/zram_drv.c
drivers/block/zram/zram_drv.h
drivers/input/joystick/xpad.c
drivers/md/dm-crypt.c
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/core/mmc.c
drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h
drivers/staging/android/ion/Kconfig
drivers/staging/android/ion/ion.c
fs/aio.c
fs/ext4/ext4_jbd2.c
fs/ext4/extents.c
fs/ext4/indirect.c
fs/ext4/inode.c
fs/ext4/mballoc.c
fs/ext4/namei.c
fs/ext4/page-io.c
fs/ext4/super.c
fs/proc/task_mmu.c
fs/pstore/pmsg.c
fs/super.c
include/linux/pagemap.h
include/linux/wlan_plat.h
include/linux/zpool.h
include/linux/zsmalloc.h
include/net/ipv6.h
ipc/msg.c
ipc/sem.c
ipc/shm.c
kernel/events/core.c
mm/Kconfig
mm/Makefile
mm/truncate.c
mm/zpool.c
mm/zsmalloc.c
net/ipv4/netfilter/arp_tables.c
net/ipv4/netfilter/ip_tables.c
net/ipv4/ping.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv6/netfilter/ip6_tables.c
net/ipv6/raw.c
net/ipv6/udp.c
net/unix/af_unix.c
sound/core/timer.c
sound/soc/soc-core.c
tools/perf/util/evsel.c
Change-Id: I65b155945b31943989118b8eb7f7070e687120ae
b2a98a96be