From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 8 Dec 2011 18:02:04 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas... 
X-Git-Tag: v3.3-rc1~141^2~2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mm/ioremap.c
---

6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d
Reading git-diff-tree failed