Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAnton Altaparmakov <aia21@hera.kernel.org>
Fri, 9 Sep 2005 15:19:10 +0000 (08:19 -0700)
committerAnton Altaparmakov <aia21@hera.kernel.org>
Fri, 9 Sep 2005 15:19:10 +0000 (08:19 -0700)

Trivial merge