From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 21 May 2012 14:15:24 +0000 (+0100)
Subject: Merge branch 'misc' into for-linus
X-Git-Tag: v3.5-rc1~182^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4175160b065e74572819a320dcd34129224a4e1c;p=pandora-kernel.git

Merge branch 'misc' into for-linus

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

4175160b065e74572819a320dcd34129224a4e1c
Reading git-diff-tree failed