From: Arnd Bergmann Date: Thu, 15 Mar 2012 20:33:47 +0000 (+0000) Subject: Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into... X-Git-Tag: v3.4-rc1~73^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e594a97c8c74533ec105b2ac9194217e918f172f;p=pandora-kernel.git Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers * 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: dm644x evm: add support for VPBE display ARM: davinci: dm644x: add support for v4l2 video display * included from the davinci/cleanup branch: ARM: davinci: dm644x: don't force vpfe registeration on all boards ARM: davinci: dm644x: fix inconsistent variable naming ARM: davinci: dm644x: improve readability using macro ARM: davinci: streamline sysmod access ARM: davinci: create new common platform header for davinci ARM: davinci: dm646x: move private definitions to C file ARM: davinci: dm365: move private definitions to C file ARM: davinci: dm644x: move private definitions to C file Conflicts: arch/arm/mach-davinci/board-dm644x-evm.c arch/arm/mach-davinci/board-neuros-osd2.c arch/arm/mach-davinci/board-sffsdr.c Signed-off-by: Arnd Bergmann --- e594a97c8c74533ec105b2ac9194217e918f172f Reading git-diff-tree failed