From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 May 2008 20:51:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
X-Git-Tag: v2.6.26-rc2~83
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa26be86b65a7183ceac29bdf1f51d6fc6932f0;p=linux-2.6

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: allow read access to available/current_clocksource
  clocksource: Fix permissions for available_clocksource
  hrtimer: remove duplicate helper function
---

afa26be86b65a7183ceac29bdf1f51d6fc6932f0