From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 6 Oct 2005 22:37:09 +0000 (-0700)
Subject: Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.14-rc4~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=edb4a3534adbaf90768d67da35f0bfeac4767db6;p=linux-2.6-omap-h63xx.git

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

edb4a3534adbaf90768d67da35f0bfeac4767db6