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

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

514fd7fd01d378a7b5584c657d9807fc28f22079