Merge branch 'master' of /home/src/linux-2.6/
authorAnton Altaparmakov <aia21@cantab.net>
Tue, 1 Nov 2005 15:51:32 +0000 (15:51 +0000)
committerAnton Altaparmakov <aia21@cantab.net>
Tue, 1 Nov 2005 15:51:32 +0000 (15:51 +0000)

Trivial merge