Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Tue, 15 Dec 2009 03:10:10 +0000 (12:10 +0900)]

Trivial merge