Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

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

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/trace/trace.c
index 4c41e22f162b5dea8d1253ce15a4140716c09372,60f49637b4d51eb38fbae4c7e0bb43bc2ee76695..d215d1cca2d943e846ab1d38b55fce88e85c7c4f
--- 1/kernel/trace/trace.c
--- 2/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -1439,9 -1437,10 +1439,11 @@@ static int trace_save_cmdline(struct ta
        }
  
        memcpy(&saved_cmdlines[idx], tsk->comm, TASK_COMM_LEN);
 +      saved_tgids[idx] = tsk->tgid;
  
        arch_spin_unlock(&trace_cmdline_lock);
+ 
+       return 1;
  }
  
  void trace_find_cmdline(int pid, char comm[])