Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)

Trivial merge