Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Fri, 9 Apr 2010 14:17:41 +0000 (15:17 +0100)]

Trivial merge