Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/hrtimer-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 18:22:11 +0000 (10:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 18:22:11 +0000 (10:22 -0800)

Trivial merge