From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 11 Jul 2005 21:08:08 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.13-rc3~90
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6;p=linux-2.6

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

1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6