spi: Sync with mainline but keep new drivers
authorTony Lindgren <tony@atomide.com>
Mon, 5 Mar 2007 13:21:40 +0000 (05:21 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 5 Mar 2007 13:21:40 +0000 (05:21 -0800)
Sync with mainline but keep new drivers

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/spi/Kconfig
drivers/spi/omap_uwire.c [new file with mode: 0644]

Simple merge
Simple merge