Merge branch 'spi' of git://gitorious.org/linus-tree/linus-tree into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 10 Apr 2012 20:09:52 +0000 (14:09 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 10 Apr 2012 20:09:56 +0000 (14:09 -0600)
commitaae730dfe239f1a5122ba873b54dffc20a516775
tree83ac8a15b6e25569c34f53fd1d246968a2d536ca
parent0034102808e0dbbf3a2394b82b1bb40b5778de9e
parent1a77b127ae147f5827043a9896d7f4cb248b402e
Merge branch 'spi' of git://gitorious.org/linus-tree/linus-tree into spi/next
drivers/spi/spi-omap2-mcspi.c