Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorFelix Blyakher <felixb@sgi.com>
Wed, 11 Mar 2009 18:28:03 +0000 (13:28 -0500)
committerFelix Blyakher <felixb@sgi.com>
Wed, 11 Mar 2009 18:28:03 +0000 (13:28 -0500)

Trivial merge