From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 11 Oct 2012 09:55:04 +0000 (+0100)
Subject: Merge branch 'fixes' into for-linus
X-Git-Tag: v3.7-rc1~40^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0f0dd57f4a85310d9936f1770a0424b49fef876;p=pandora-kernel.git

Merge branch 'fixes' into for-linus

Conflicts:
	arch/arm/kernel/smp.c
---

a0f0dd57f4a85310d9936f1770a0424b49fef876
Reading git-diff-tree failed