Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Sat, 25 Jun 2011 19:22:28 +0000 (19:22 +0000)
committerSteve French <sfrench@us.ibm.com>
Sat, 25 Jun 2011 19:22:28 +0000 (19:22 +0000)

Trivial merge