From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 23:06:15 +0000 (-0700)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.12~67
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a38133298fc678335a0229e97b6161a7ac6fec84;p=linux-2.6

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

a38133298fc678335a0229e97b6161a7ac6fec84