Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 01:31:38 +0000 (17:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 01:31:38 +0000 (17:31 -0800)

Trivial merge