]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* 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


Trivial merge