Merge branch 'devicetree/merge' into spi/merge
authorGrant Likely <grant.likely@secretlab.ca>
Sun, 13 Feb 2011 06:53:34 +0000 (23:53 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Sun, 13 Feb 2011 06:53:34 +0000 (23:53 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge