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

Trivial merge