Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Mauro Carvalho Chehab [Sun, 15 Jan 2006 22:59:29 +0000 (20:59 -0200)]

Trivial merge