Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Thu, 28 Aug 2008 02:47:00 +0000 (02:47 +0000)
committerSteve French <sfrench@us.ibm.com>
Thu, 28 Aug 2008 02:47:00 +0000 (02:47 +0000)

Trivial merge