Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 6 May 2006 18:59:18 +0000 (19:59 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 6 May 2006 18:59:18 +0000 (19:59 +0100)
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Trivial merge