Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorFelix Blyakher <felixb@sgi.com>
Thu, 29 Jan 2009 22:55:56 +0000 (16:55 -0600)
committerFelix Blyakher <felixb@sgi.com>
Thu, 29 Jan 2009 22:55:56 +0000 (16:55 -0600)

Trivial merge