From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 13 Oct 2005 22:49:40 +0000 (-0400)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.15-rc1~733^2~56
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8f32be3874a310fa963d47b534a98be1a05a4cc;p=linux-2.6

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

c8f32be3874a310fa963d47b534a98be1a05a4cc