From: Grant Likely <grant.likely@secretlab.ca>
Date: Mon, 30 Jan 2012 15:32:37 +0000 (-0700)
Subject: Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bc266185888e4033d8439b4fc6bdd14a41f4041e;p=deliverable%2Flinux.git

Merge branch 'spi/s3c64xx' of git://git./linux/kernel/git/broonie/misc

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

bc266185888e4033d8439b4fc6bdd14a41f4041e