Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 18 Jun 2005 07:36:46 +0000 (08:36 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 18 Jun 2005 07:36:46 +0000 (08:36 +0100)

Trivial merge