]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45bfe98 c9db4fa)
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
Linux 2.6 source tree