From: Juha Yrjola Date: Tue, 18 Apr 2006 17:02:48 +0000 (+0300) Subject: Merge source.mvista.com:linux-omap X-Git-Tag: v2.6.17-omap1~101 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330c1eb9a689973326cdece277d0b4b409833bb9;p=pandora-kernel.git Merge source.mvista.com:linux-omap Conflicts: arch/arm/mach-omap1/board-nokia770.c drivers/i2c/chips/tlv320aic23.c sound/arm/omap-aic23.h --- 330c1eb9a689973326cdece277d0b4b409833bb9 Reading git-diff-tree failed