From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 12 Oct 2007 22:44:30 +0000 (+0100)
Subject: Merge branches 'omap1-upstream' and 'omap2-upstream' into devel
X-Git-Tag: v2.6.24-rc1~1273^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=92633b72d18ca4f25de1f28e436a882159491e7e;p=linux.git

Merge branches 'omap1-upstream' and 'omap2-upstream' into devel
---

92633b72d18ca4f25de1f28e436a882159491e7e