Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDave Jones <davej@redhat.com>
Thu, 18 Aug 2005 05:56:07 +0000 (22:56 -0700)
committerDave Jones <davej@redhat.com>
Thu, 18 Aug 2005 05:56:07 +0000 (22:56 -0700)

Trivial merge