From: Tony Lindgren <tony@atomide.com>
Date: Mon, 7 Aug 2006 15:09:05 +0000 (+0300)
Subject: Manual merge to make things compile after updating to 2.6.18-rc4
X-Git-Tag: v2.6.18-omap1~119
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1230366a669d16c7a292586adc7ab0725395f5b4;p=pandora-kernel.git

Manual merge to make things compile after updating to 2.6.18-rc4

Some things are probably broken right now with the generic irq
code update.
---

Reading git-diff-tree failed