From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 25 Sep 2012 12:41:02 +0000 (+0100)
Subject: Merge tag 'v3.6-rc6' into spi-mxs
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~41^2~1^3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac48f6cb5f268daff06b636444819e5ffb462611;p=pandora-kernel.git

Merge tag 'v3.6-rc6' into spi-mxs

Linux 3.6-rc6

Conflicts (overlap between moving code that accesses registers around
and factoring the register access out into a SSP layer):
	drivers/mmc/host/mxs-mmc.c
---

ac48f6cb5f268daff06b636444819e5ffb462611
Reading git-diff-tree failed