Merge branch 'spi/next' (early part) into spi/merge
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 5 Jan 2012 04:39:29 +0000 (21:39 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 5 Jan 2012 04:39:29 +0000 (21:39 -0700)
1  2 
drivers/spi/Kconfig

Simple merge