Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Tue, 22 Apr 2008 11:34:25 +0000 (12:34 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Tue, 22 Apr 2008 11:34:25 +0000 (12:34 +0100)

Trivial merge