Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Fri, 25 Apr 2008 20:20:10 +0000 (20:20 +0000)
committerSteve French <sfrench@us.ibm.com>
Fri, 25 Apr 2008 20:20:10 +0000 (20:20 +0000)

Trivial merge