From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 2 Jun 2005 02:17:59 +0000 (-0700)
Subject: Merge of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.12-rc6~31
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda;p=linux-2.6

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

e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda