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

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

Linux 3.6-rc6

Conflicts:
	drivers/spi/spi-omap2-mcspi.c
---

8e5d0661b3948f3c5a143f32d192710375822af2
Reading git-diff-tree failed