From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 27 Feb 2012 14:58:53 +0000 (+0000)
Subject: Merge branch 'davinci/cleanups' into next/cleanup
X-Git-Tag: v3.4-rc1~91^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3a3c4664184f86ef964323d106c62158e2b3f25;p=pandora-kernel.git

Merge branch 'davinci/cleanups' into next/cleanup

* davinci/cleanups:
  ARM: davinci: add back dummy header files
  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
---

a3a3c4664184f86ef964323d106c62158e2b3f25
Reading git-diff-tree failed