From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 16 Jul 2005 00:52:13 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.13-rc4~92
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83;p=linux-2.6

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

d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83