Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@infradead.org>
Mon, 17 Apr 2006 14:35:18 +0000 (15:35 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Mon, 17 Apr 2006 14:35:18 +0000 (15:35 +0100)

Trivial merge