Merge branch 'linus' into queue

Merge reason: development work has dependency on kvm patches merged
upstream.

Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --cc Documentation/feature-removal-schedule.txt
index d6dd84fbea842687737b4aa9f61ce22ffdc3a3a7,03ca210406edfcbe90fc58cd006ef0e7d313b42f..223fe9fcfd94eceb57c398b70642a4f6ab521ff7
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -534,7 -534,8 +534,16 @@@ Who:      Kees Cook <keescook@chromium.org
  
  ----------------------------
  
+ What: setitimer accepts user NULL pointer (value)
+ When: 3.6
+ Why:  setitimer is not returning -EFAULT if user pointer is NULL. This
+       violates the spec.
+ Who:  Sasikantha Babu <sasikanth.v19@gmail.com>
++
++----------------------------
++
 +What: KVM debugfs statistics
 +When: 2013
 +Why:  KVM tracepoints provide mostly equivalent information in a much more
 +        flexible fashion.
++

diff --cc arch/x86/kvm/vmx.c
Simple merge

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

diff --cc virt/kvm/kvm_main.c
Simple merge