Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorFelix Blyakher <felixb@sgi.com>
Wed, 10 Jun 2009 22:07:47 +0000 (17:07 -0500)
committerFelix Blyakher <felixb@sgi.com>
Wed, 10 Jun 2009 22:07:47 +0000 (17:07 -0500)

Trivial merge