Merge branch 'linaro-android-3.10-lsk' of

git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

diff --cc Documentation/filesystems/proc.txt
Simple merge

diff --cc drivers/md/dm-verity.c
Simple merge

diff --cc fs/debugfs/inode.c
Simple merge

diff --cc fs/devpts/inode.c
Simple merge

diff --cc fs/ecryptfs/file.c
Simple merge

diff --cc fs/ext2/super.c
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/fuse/inode.c
Simple merge

diff --cc fs/hpfs/super.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/proc/root.c
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

diff --cc fs/pstore/inode.c
Simple merge

diff --cc fs/reiserfs/super.c
Simple merge

diff --cc fs/ubifs/super.c
Simple merge

diff --cc fs/udf/super.c
index 839a2bad7f45b693db4ed478598b997c42077712,3b1a4bea332dc55b51d06808f8c318e1e9573e73..32f5297dfbaba1a5f591b6e6f28402ddf24d56ad
--- 1/fs/udf/super.c
--- 2/fs/udf/super.c
+++ b/fs/udf/super.c
@@@ -629,13 -629,8 +629,14 @@@ static int udf_remount_fs(struct super_
        struct udf_options uopt;
        struct udf_sb_info *sbi = UDF_SB(sb);
        int error = 0;
+       sync_filesystem(sb);
  
 +      if (sbi->s_lvid_bh) {
 +              int write_rev = le16_to_cpu(udf_sb_lvidiu(sbi)->minUDFWriteRev);
 +              if (write_rev > UDF_MAX_WRITE_VERSION && !(*flags & MS_RDONLY))
 +                      return -EACCES;
 +      }
 +
        uopt.flags = sbi->s_flags;
        uopt.uid   = sbi->s_uid;
        uopt.gid   = sbi->s_gid;

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/mlock.c
Simple merge

diff --cc net/ipv4/fib_frontend.c
Simple merge

diff --cc net/ipv4/fib_semantics.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge

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

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

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