Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Jaroslav Kysela [Fri, 8 Jan 2010 08:26:34 +0000 (09:26 +0100)]

Trivial merge