5dadaf427c302ed35f738c2be55b
parent f020c39e51b1ef8389d5cf38190d32f55ff9d556
parent c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9
author Grant Likely <grant.likely@secretlab.ca> 1298411810 -0700
committer Grant Likely <grant.likely@secretlab.ca> 1298411820 -0700

Merge branch 'devicetree/next' into spi/next

To pick up removal of #ifdef around .of_match_table
Hpvڝ)x