Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 21 Oct 2006 15:46:04 +0000 (16:46 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 21 Oct 2006 15:46:04 +0000 (16:46 +0100)

Trivial merge