From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 9 Jun 2005 22:25:29 +0000 (-0700)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.12~47
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99fdb2fe523480a8748a5af18139bb1f7785c815;p=linux-2.6

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

99fdb2fe523480a8748a5af18139bb1f7785c815