From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 17 Jun 2011 14:32:26 +0000 (-0600)
Subject: Merge branch 'spi/merge' into spi/next
X-Git-Tag: v3.1-rc1~312^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f8db4cc4f2b11bdded6c94f0d55906847474b982;p=linux.git

Merge branch 'spi/merge' into spi/next
---

f8db4cc4f2b11bdded6c94f0d55906847474b982