From: Russell King Date: Tue, 7 Oct 2008 18:08:32 +0000 (+0100) Subject: Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc513ac0f29473de365664c4fba9cf033c1f2324;p=pandora-kernel.git Merge branch 'viper-for-rmk' of git://misterjones.org/linux-2.6-arm Merge branch 'pxa-viper' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile drivers/pcmcia/Kconfig drivers/pcmcia/Makefile --- cc513ac0f29473de365664c4fba9cf033c1f2324 Reading git-diff-tree failed