Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 17 Jan 2007 23:34:51 +0000 (10:34 +1100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 17 Jan 2007 23:34:51 +0000 (10:34 +1100)

Trivial merge