Merge branch 'gpio/next-mx' into gpio/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 6 Jun 2011 16:10:07 +0000 (10:10 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 6 Jun 2011 16:10:07 +0000 (10:10 -0600)

Trivial merge