From: Linus Torvalds Date: Thu, 26 Jul 2012 19:57:41 +0000 (-0700) Subject: Merge tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0082c16e3a6d87c7b156ccf21f5e6c448b102809;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'spi-3.6' of git://git./linux/kernel/git/broonie/misc Pull spi updates from Mark Brown: "Since Grant is even more specacularly busy than usual for the time being I've been collecting SPI patches for him for this release - probably things will revert back to Grant before the next release. There's nothing too exciting here, mostly it's simple driver specific stuff: - Add spi: to the modaliases of SPI devices to provide namespacing. - A driver for AD-FMCOMMS1-EBZ. - DT binding for Orion. - Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers. There may be a few more fixes I've missed, people keep sending me new things." * tag 'spi-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc: spi/orion: remove uneeded spi_info spi/bcm63xx: fix clock configuration selection spi/orion: add device tree binding spi/omap2: mark omap2_mcspi_master_setup as __devinit spi: omap2-mcspi: Fix the below warning spi: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver spi/imx: use gpio_is_valid to determine if a gpio is valid spi/imx: remove redundant config.speed_hz setting spi/gpio: start with CS non-active spi: tegra: use dmaengine based dma driver spi/pl022: cleanup pl022 header documentation spi/pl022: enable runtime PM spi/pl022: delete DB5500 support spi/pl022: disable port when unused spi: Add "spi:" prefix to modalias attribute of spi devices --- 0082c16e3a6d87c7b156ccf21f5e6c448b102809