Merge with /shiny/git/linux-2.6/.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Wed, 13 Jul 2005 14:25:59 +0000 (15:25 +0100)

Trivial merge