From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Thu, 21 Oct 2010 18:21:55 +0000 (-0700)
Subject: Merge branch 'davinci-next' into davinci-for-linus
X-Git-Tag: v2.6.37-rc1~122^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7940a34b2e1e0485211a17d8c3ab4da1ea3e1330;p=pandora-kernel.git

Merge branch 'davinci-next' into davinci-for-linus

Conflicts:
	arch/arm/mach-davinci/board-da830-evm.c
	arch/arm/mach-davinci/board-da850-evm.c
---

7940a34b2e1e0485211a17d8c3ab4da1ea3e1330
Reading git-diff-tree failed