Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Trond Myklebust [Fri, 28 Oct 2005 02:13:32 +0000 (22:13 -0400)]

Trivial merge