Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into...

* android-3.10: (40 commits)
  fs: ecryptfs: readdir: constify actor
  mm: reorder can_do_mlock to fix audit denial
  dm-verity: Add modes and emit uevent on corrupted blocks
  proc: make oom adjustment files user read-only
  Revert "Grants system server access to /proc/<pid>/oom_adj for Android applications."
  fs/proc/task_mmu.c: add user-space support for resetting mm->hiwater_rss (peak RSS)
  net: ping: Return EAFNOSUPPORT when appropriate.
  lz4: fix compression/decompression signedness mismatch
  lib: add lz4 compressor module
  decompressor: add LZ4 decompressor module
  Squashfs: Add LZ4 compression configuration option
  Squashfs: add LZ4 compression support
  fs/squashfs/super.c: logging cleanup
  fs/squashfs/file_direct.c: replace count*size kmalloc by kmalloc_array
  fs/squashfs/squashfs.h: replace pr_warning by pr_warn
  fs: push sync_filesystem() down to the file system's remount_fs()
  Squashfs: fix failure to unlock pages on decompress error
  Squashfs: Check stream is not NULL in decompressor_multi.c
  Squashfs: Directly decompress into the page cache for file data
  Squashfs: Restructure squashfs_readpage()
  ...

diff --cc net/ipv6/ping.c
Simple merge