Merge branch 'android-3.10' into android-tegra-3.10

* d9a6b2f wakeup: Add the guard condition for len in
* 52687d2 selinux: Android kernel compatibility with M userspace
* 0599dbc selinux: extended permissions for ioctls
* 5d6b756 security: add ioctl specific auditing to lsm_audit
* b501c52 selinux: remove unnecessary pointer reassignment
* ce753d2 Revert "security: lsm_audit: add ioctl specific auditing"
* 0319443 Revert "SELinux: per-command whitelisting of ioctls"
* f8fd782 Revert "SELinux: use deletion-safe iterator to free list"
* 7b3c6a6 Revert "SELinux: ss: Fix policy write for ioctl operations"
* e3c18f2 arm: mm: support ARCH_MMAP_RND_BITS.
* 3d269ec mm: mmap: Add new /proc tunable for mmap_base ASLR.
* b35e1a7 net: fix iterating over hashtable in tcp_nuke_addr()
* 1704588 uid_cputime: Check for the range while removing range of
* 8215e4b zsmalloc: add maintainers
* fc0b10d MAINTAINERS: add zswap and zbud maintainer
* eb12875 lz4: fix another possible overrun
* ba78606 lz4: ensure length does not wrap
* 6b7947a lib/lz4: correct the LZ4 license
* fc6ca6b zram: fix error return code
* 1af0554 zram: optimize memory operations with
* 921561f zram: allow request end to coincide with disksize
* d26908d zram: support REQ_DISCARD
* 3f93377 zram: use scnprintf() in attrs show() methods
* 78e4f63 zram: propagate error to user
* de3524d zram: return error-valued pointer from zcomp_create()
* 17bed77 zram: move comp allocation out of init_lock
* 85d79d6 zram: add lz4 algorithm backend
* 5ba7b57 zram: make compression algorithm selection possible
* 44d08a8 zram: add set_max_streams knob
* f341c57 zram: add multi stream functionality
* cbd0d53 zram: document failed_reads, failed_writes stats
* 35ec567 zram: factor out single stream compression
* d8b135a zram: use zcomp compressing backends
* f341c10 zram: introduce compressing backend abstraction
* 2ffac71 zram: delete zram_init_device()
* e910f96 zram: move zram size warning to documentation
* 1e9b7dd zram: drop not used table `count' member
* 04e0d0f zram: report failed read and write stats
* 20bd753 zram: remove zram stats code duplication
* f6e2932 zram: use atomic64_t for all zram stats
* 3e8fcc5 zram: remove good and bad compress stats
* 152ad43 zram: do not pass rw argument to __zram_make_request()
* dd04c5c zram: drop `init_done' struct zram member
* ea21cbe zram: avoid null access when fail to alloc meta
* 4731d38 zram: remove zram->lock in read path and change it with
* 5a85eb3 zram: remove workqueue for freeing removed pending slot
* a1fa1eb zram: introduce zram->tb_lock
* f41be69 zram: prevent data loss in error cases of function
* 0cdfb61 zram: use atomic operation for stat
* d8fd96e zram: fix race between reset and flushing pending work
* a894fed zram: add copyright
* b1628c3 zram: remove old private project comment
* cbdbe73 zram: promote zram from staging
* d6ec8a6 zram: kill unused zram_get_num_devices()
* eb0a41b zram: destroy all devices on error recovery path in
* d9371c0 Staging: zram: Fix memory leak by refcount mismatch
* 064fe07 zram: fix invalid memory access
* 2bb74a0 zsmalloc: Fix CPU hotplug callback registration
* 61f933a CPU hotplug: Provide lockless versions of callback
registration functions
* 061b807 zsmalloc: add copyright
* 5860c1a1 zsmalloc: move it under mm
* ba4fcc7 staging: zram: protect zram_reset_device() call
* c49679f zram: remove zram_sysfs file (v2)
* 914e13c zram: avoid access beyond the zram device
* a34e865 zram: use atomic64_xxx() to replace zram_stat64_xxx()
* 9f60aea staging: zram: fix invalid memory references during disk

Change-Id: I970df8e69c4cbf61fa1eb3e78e337c85d93f4b2b