From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 21 Apr 2005 21:02:34 +0000 (-0700)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
X-Git-Tag: v2.6.12-rc4~292
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d134db051134c38ae6bf36034403c7da7f0e3da;p=linux-2.6

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

8d134db051134c38ae6bf36034403c7da7f0e3da