Merge branch 'devicetree/next' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 22 Feb 2011 21:56:50 +0000 (14:56 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 22 Feb 2011 21:57:00 +0000 (14:57 -0700)
To pick up removal of #ifdef around .of_match_table


Trivial merge