From: Mark Brown <broonie@linaro.org>
Date: Fri, 27 Sep 2013 13:27:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~15^2~6^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cab71e7014dc73a84e1d14d9b02e39c48241580;p=pandora-kernel.git

Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx

Conflicts:
	drivers/spi/spi-s3c64xx.c
---

0cab71e7014dc73a84e1d14d9b02e39c48241580
Reading git-diff-tree failed