From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Jan 2012 13:24:33 +0000 (+0000)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Tag: v3.3-rc1~176^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e0e943436912ffe0848ece58167edfe754edb96;p=pandora-kernel.git

Merge branch 'devel-stable' into for-linus

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
---

2e0e943436912ffe0848ece58167edfe754edb96
Reading git-diff-tree failed