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)
commit661dd5c840851194c7ee5a2603d5354dcf9bd212
treeae8698638f21deeca51c1522bb8ccfd6a7735770
parent45bfe98bd790b5ded00462cd582effcfb42263cc
parentc9db4fa11526affde83603fe52595bd1260c1354
Merge /pub/scm/linux/kernel/git/tglx/hrtimer-2.6