From: Tony Lindgren Date: Fri, 18 Nov 2005 01:05:25 +0000 (-0800) Subject: ARM: OMAP: Manual merge after sync with mainline X-Git-Tag: v2.6.15-omap2~85 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7300940fa85d8a8ce706f2a6592a8c1409b9b204;p=pandora-kernel.git ARM: OMAP: Manual merge after sync with mainline Manual merge after sync with mainline --- Reading git-diff-tree failed