Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree...
authorGrant Likely <grant.likely@secretlab.ca>
Fri, 4 Nov 2011 03:32:20 +0000 (23:32 -0400)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 4 Nov 2011 03:32:20 +0000 (23:32 -0400)

Trivial merge