From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 29 Jun 2013 10:44:43 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~41^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727;p=pandora-kernel.git

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/Makefile
	arch/arm/include/asm/glue-proc.h
---

3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727
Reading git-diff-tree failed