From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Thu, 19 Apr 2012 20:06:26 +0000 (-0300)
Subject: Merge branch 'linus' into queue
X-Git-Tag: v3.12-rc1~3092^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eac0556750e727ff39144a9a9e59d5ccf1fc0e2a;p=kernel%2Fkernel-generic.git

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>
---

eac0556750e727ff39144a9a9e59d5ccf1fc0e2a
diff --cc Documentation/feature-removal-schedule.txt
index d6dd84f,03ca210..223fe9f
--- a/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.
++