Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 1 Aug 2007 10:23:57 +0000 (11:23 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 1 Aug 2007 10:23:57 +0000 (11:23 +0100)

Trivial merge