From: Tony Lindgren <tony@atomide.com>
Date: Mon, 22 Dec 2008 15:27:47 +0000 (+0200)
Subject: Merge branch 'for-tony-mailbox'
X-Git-Tag: v2.6.28-davinci1-diff-base~50
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76044b05598cd9350738c3e74018a29960e3ca24;p=pandora-kernel.git

Merge branch 'for-tony-mailbox'

Conflicts:

	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/include/mach/omap34xx.h
	arch/arm/plat-omap/mailbox.c
---

76044b05598cd9350738c3e74018a29960e3ca24
Reading git-diff-tree failed