Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Fri, 14 May 2010 15:15:28 +0000 (15:15 +0000)
committerSteve French <sfrench@us.ibm.com>
Fri, 14 May 2010 15:15:28 +0000 (15:15 +0000)

Trivial merge