a0a
parent 4f95f81a48623982879f4fa80c641933444afd18
author Linus Torvalds <torvalds@linux-foundation.org> 1209847870 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209847870 -0700

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