From: Grant Likely <grant.likely@secretlab.ca>
Date: Thu, 10 May 2012 00:32:01 +0000 (-0600)
Subject: Merge tag 'v3.4-rc6' into spi/next
X-Git-Tag: v3.5-rc1~95^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3aa450c063e29b4f4b622480e1779e5e256d8f8f;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'v3.4-rc6' into spi/next

Linux 3.4-rc6
---

3aa450c063e29b4f4b622480e1779e5e256d8f8f