Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6
Linus Torvalds [Tue, 10 Jan 2006 01:31:38 +0000 (17:31 -0800)]

Trivial merge