From: Olof Johansson <olof@lixom.net>
Date: Fri, 5 Oct 2012 03:17:25 +0000 (-0700)
Subject: Merge branch 'late/kirkwood' into late/soc
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54d69df5849ec2e660aa12ac75562618c10fb499;p=pandora-kernel.git

Merge branch 'late/kirkwood' into late/soc

Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

54d69df5849ec2e660aa12ac75562618c10fb499
Reading git-diff-tree failed