From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2008 15:37:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
X-Git-Tag: v2.6.26-rc1~1151
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=73e3e6481f56b3b5b618671a8d32b19a35f84316;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  clocksource: make clocksource watchdog cycle through online CPUs
  Documentation: move timer related documentation to a single place
  clockevents: optimise tick_nohz_stop_sched_tick() a bit
  locking: remove unused double_spin_lock()
  hrtimers: simplify lockdep handling
  timers: simplify lockdep handling
  posix-timers: fix shadowed variables
  timer_list: add annotations to workqueue.c
  hrtimer: use nanosleep specific restart_block fields
  hrtimer: add nanosleep specific restart_block member
---

73e3e6481f56b3b5b618671a8d32b19a35f84316