Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Sat, 27 Aug 2005 12:30:07 +0000 (14:30 +0200)

Trivial merge