From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 May 2013 10:48:50 +0000 (+0100)
Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant
X-Git-Tag: v3.10-rc2~35^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3086c9f6482101b3c06935cdfb4d4b56adb60097;p=pandora-kernel.git

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant
---

3086c9f6482101b3c06935cdfb4d4b56adb60097
Reading git-diff-tree failed