From: Linus Torvalds Date: Fri, 18 Mar 2011 17:56:02 +0000 (-0700) Subject: Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 X-Git-Tag: upstream/snapshot3+hdmi~11164 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b061c59c27e0385e53c961d9fbd18c1c078d9823;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits) spi/dw_spi: move dw_spi.h into drivers/spi spi/dw_spi: Fix missing header gpio/langwell: Clear edge bit before handling gpio/langwell: Simplify demux loop gpio/langwell: Convert irq name space gpio/langwell: Fix broken irq_eoi change. gpio; Make Intel chipset gpio drivers depend on x86 gpio/cs5535-gpio: Fix section mismatch spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices spi/davinci: Support DMA transfers larger than 65535 words spi/davinci: Use correct length parameter to dma_map_single calls gpio: Use __devexit at necessary places gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio gpio/mcp23s08: support mcp23s17 variant of_mmc_spi: add card detect irq support spi/omap_mcspi: catch xfers of non-multiple SPI word size spi/omap_mcspi: Off-by-one error in finding the right divisor gpio/pca953x: Fix wrong pointer type spi/pl022: rid dangling labels spi: add support for SuperH SPI ... --- b061c59c27e0385e53c961d9fbd18c1c078d9823