From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 12 Nov 2013 10:58:59 +0000 (+0000)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: v3.13-rc1~103^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df762eccbadf87850fbee444d729e0f1b1e946f1;p=pandora-kernel.git

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/include/asm/atomic.h
	arch/arm/include/asm/hardirq.h
	arch/arm/kernel/smp.c
---

df762eccbadf87850fbee444d729e0f1b1e946f1
Reading git-diff-tree failed