From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Apr 2012 22:16:26 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.alex.org.uk

Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "The itimer removal one is not strictly a fix, but I really wanted to
  avoid a rebase of the urgent ones."

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "clocksource: Load the ACPI PM clocksource asynchronously"
  clockevents: tTack broadcast device mode change in tick_broadcast_switch_to_oneshot()
  itimer: Use printk_once instead of WARN_ONCE
  nohz: Fix stale jiffies update in tick_nohz_restart()
  tick: Document TICK_ONESHOT config option
  proc: stats: Use arch_idle_time for idle and iowait times if available
  itimer: Schedule silent NULL pointer fixup in setitimer() for removal
---

ccb1ec95e924a24906ef01ce6d028a8dc13dc87d
diff --cc Documentation/feature-removal-schedule.txt
index 709e08e,32fae81..03ca210
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -524,10 -532,8 +524,18 @@@ Who:	Cong Wang <amwang@redhat.com
  
  ----------------------------
  
 +What:	get_robust_list syscall
 +When:	2013
 +Why:	There appear to be no production users of the get_robust_list syscall,
 +	and it runs the risk of leaking address locations, allowing the bypass
 +	of ASLR. It was only ever intended for debugging, so it should be
 +	removed.
 +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>