From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Nov 2011 00:31:14 +0000 (-0700)
Subject: Merge branch 'linus' into cbus
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a98bb4392c7dba88a375cce90bcbe45c85f9eedd;p=pandora-kernel.git

Merge branch 'linus' into cbus

Conflicts:
	arch/arm/mach-omap1/board-nokia770.c
---

a98bb4392c7dba88a375cce90bcbe45c85f9eedd
Reading git-diff-tree failed