Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Fri, 1 Jan 2010 05:00:42 +0000 (05:00 +0000)
committerSteve French <sfrench@us.ibm.com>
Fri, 1 Jan 2010 05:00:42 +0000 (05:00 +0000)

Trivial merge