Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Thu, 2 Aug 2007 21:36:28 +0000 (22:36 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Thu, 2 Aug 2007 21:36:28 +0000 (22:36 +0100)

Trivial merge