Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2008 20:51:10 +0000 (13:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2008 20:51:10 +0000 (13:51 -0700)
commitafa26be86b65a7183ceac29bdf1f51d6fc6932f0
treeb7b24e134d34f17e62085ecb8a9583e00f1c7248
parent269f21344b23e552c21c9e2d7ca258479dcd7a0a
parent4f95f81a48623982879f4fa80c641933444afd18
Merge git://git./linux/kernel/git/tglx/linux-2.6-hrt

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  clocksource: allow read access to available/current_clocksource
  clocksource: Fix permissions for available_clocksource
  hrtimer: remove duplicate helper function