Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorFelix Blyakher <felixb@sgi.com>
Tue, 27 Jan 2009 20:16:18 +0000 (14:16 -0600)
committerFelix Blyakher <felixb@sgi.com>
Tue, 27 Jan 2009 20:16:18 +0000 (14:16 -0600)

Trivial merge