Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAnton Altaparmakov <aia21@hera.kernel.org>
Mon, 12 Sep 2005 16:05:41 +0000 (09:05 -0700)
committerAnton Altaparmakov <aia21@hera.kernel.org>
Mon, 12 Sep 2005 16:05:41 +0000 (09:05 -0700)

Trivial merge