Merge tag 'v3.3-rc7' into gpio/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 12 Mar 2012 15:41:28 +0000 (09:41 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 12 Mar 2012 15:41:28 +0000 (09:41 -0600)
Linux 3.3-rc7.  Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches


Trivial merge