Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Sat, 29 Oct 2005 05:10:35 +0000 (03:10 -0200)
committerArnaldo Carvalho de Melo <acme@mandriva.com>
Sat, 29 Oct 2005 05:10:35 +0000 (03:10 -0200)

Trivial merge