Merge branch 'master' of /usr/src/linux-2.6
authorAnton Altaparmakov <aia21@cantab.net>
Thu, 8 Sep 2005 22:03:30 +0000 (23:03 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Thu, 8 Sep 2005 22:03:30 +0000 (23:03 +0100)

Trivial merge