From: Grant Likely Date: Tue, 22 Feb 2011 21:56:50 +0000 (-0700) Subject: Merge branch 'devicetree/next' into spi/next X-Git-Tag: v2.6.39-rc1~417^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9bde36afcaf0ec2ad9f03974da41875c759a4fe8;p=users%2Fjedix%2Flinux-maple.git Merge branch 'devicetree/next' into spi/next To pick up removal of #ifdef around .of_match_table --- 9bde36afcaf0ec2ad9f03974da41875c759a4fe8