From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 10 Aug 2010 11:22:08 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v2.6.37-rc1~139^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb8231a8b139035476f2a8aaac837d0099b66dad;p=pandora-kernel.git

Merge branch 'master' into for-next

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

fb8231a8b139035476f2a8aaac837d0099b66dad
Reading git-diff-tree failed