Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Mon, 26 Jun 2006 15:35:44 +0000 (16:35 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Mon, 26 Jun 2006 15:35:44 +0000 (16:35 +0100)

Trivial merge