From: Grant Likely Date: Thu, 17 Mar 2011 19:46:58 +0000 (-0600) Subject: Merge remote-tracking branch 'origin' into spi/next X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2dd22997679a88874c131f6e6ffb963e6d43b3a6;p=deliverable%2Flinux.git Merge remote-tracking branch 'origin' into spi/next Pull in Linus' tree to pick up changes required for the langwell gpio fixes --- 2dd22997679a88874c131f6e6ffb963e6d43b3a6