Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorAlex Elder <aelder@sgi.com>
Mon, 8 Aug 2011 12:06:24 +0000 (07:06 -0500)
committerAlex Elder <aelder@sgi.com>
Mon, 8 Aug 2011 12:06:24 +0000 (07:06 -0500)

Trivial merge