From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 5 Dec 2011 23:20:17 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux... 
X-Git-Tag: v3.3-rc1~141^2~3^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=742eaa6a6e356a16788ce6530271de89bc4f8fb5;p=pandora-kernel.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/will/linux into devel-stable

Conflicts:
	arch/arm/common/gic.c
	arch/arm/plat-omap/include/plat/common.h
---

742eaa6a6e356a16788ce6530271de89bc4f8fb5
Reading git-diff-tree failed