Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Wed, 16 Jun 2010 13:19:36 +0000 (13:19 +0000)
committerSteve French <sfrench@us.ibm.com>
Wed, 16 Jun 2010 13:19:36 +0000 (13:19 +0000)

Trivial merge