Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAlex Elder <elder@ieee.org>
Thu, 10 Sep 2009 19:33:56 +0000 (14:33 -0500)
committerAlex Elder <aelder@sgi.com>
Thu, 10 Sep 2009 19:33:56 +0000 (14:33 -0500)

Trivial merge