Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilma...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 15:41:15 +0000 (15:41 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 15 Mar 2011 15:41:26 +0000 (15:41 +0000)
1  2 
drivers/spi/Kconfig

Simple merge