Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 17 May 2005 11:04:46 +0000 (12:04 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 17 May 2005 11:04:46 +0000 (12:04 +0100)

Trivial merge