Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Tue, 26 Aug 2008 16:56:05 +0000 (16:56 +0000)
committerSteve French <sfrench@us.ibm.com>
Tue, 26 Aug 2008 16:56:05 +0000 (16:56 +0000)

Trivial merge