Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAnton Vorontsov <cbouatmailru@gmail.com>
Mon, 26 Apr 2010 17:56:19 +0000 (21:56 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Mon, 26 Apr 2010 17:56:19 +0000 (21:56 +0400)

Trivial merge