Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorFelix Blyakher <felixb@sgi.com>
Tue, 3 Feb 2009 15:51:52 +0000 (09:51 -0600)
committerFelix Blyakher <felixb@sgi.com>
Tue, 3 Feb 2009 15:51:52 +0000 (09:51 -0600)

Trivial merge