mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity
linux-stable/drivers/spi
History
Linus Torvalds 0df0914d41 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
  omap: zoom: host should not pull up wl1271's irq line
  arm: plat-omap: iommu: fix request_mem_region() error path
  OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
  omap4: mux: Remove duplicate mux modes
  omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
  omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
  omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
  omap4: board-omap4panda: Initialise the serial pads
  omap3: board-3430sdp: Initialise the serial pads
  omap4: board-4430sdp: Initialise the serial pads
  omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
  omap2+: mux: Remove the use of IDLE flag
  omap2+: Add separate list for dynamic pads to mux
  perf: add OMAP support for the new power events
  OMAP4: Add IVA OPP enteries.
  OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
  OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
  OMAP3+: OPP: Replace voltage values with Macros
  OMAP3: wdtimer: Fix CORE idle transition
  Watchdog: omap_wdt: add fine grain runtime-pm
  ...

Fix up various conflicts in
 - arch/arm/mach-omap2/board-omap3evm.c
 - arch/arm/mach-omap2/clock3xxx_data.c
 - arch/arm/mach-omap2/usb-musb.c
 - arch/arm/plat-omap/include/plat/usb.h
 - drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
amba-pl022.c ARM: amba: make probe() functions take const id tables 2011-02-23 16:24:14 +00:00
ath79_spi.c SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs 2011-01-18 19:30:27 +01:00
atmel_spi.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
atmel_spi.h
au1550_spi.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
coldfire_qspi.c spi/m68knommu: Coldfire QSPI platform support 2010-12-29 23:28:25 -07:00
davinci_spi.c davinci: spi: move event queue parameter to platform data 2011-02-28 14:53:29 -08:00
dw_spi.c spi/dw_spi Typo change diable to disable. 2010-12-30 23:44:55 -07:00
dw_spi_mid.c spi/dw_spi: add DMA support 2010-12-24 01:23:25 -07:00
dw_spi_mmio.c spi/dw_spi: don't treat NULL clk as an error 2011-01-11 08:20:07 -07:00
dw_spi_pci.c spi/dw_spi: add DMA support 2010-12-24 01:23:25 -07:00
ep93xx_spi.c spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller 2010-05-25 00:23:16 -06:00
Kconfig Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable 2011-03-15 15:41:26 +00:00
Makefile spi: add ti-ssp spi master driver 2011-03-15 08:17:22 -07:00
mpc52xx_psc_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
mpc52xx_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
mpc512x_psc_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
omap2_mcspi.c OMAP: runtime: McSPI driver runtime conversion 2011-02-17 09:54:13 -08:00
omap_spi_100k.c SPI100k: Fix 8-bit and RX-only transfers 2010-07-03 22:45:44 -06:00
omap_uwire.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
orion_spi.c spi/orion: Drop unnecessary null test 2010-09-29 17:31:29 +09:00
pxa2xx_spi.c driver-core: remove conditionals around devicetree pointers 2011-01-21 09:24:48 -07:00
pxa2xx_spi_pci.c Merge commit 'v2.6.38-rc6' into devicetree/next 2011-02-28 01:36:21 -07:00
spi.c spi / PM: Support dev_pm_ops 2010-12-25 15:32:27 +01:00
spi_bfin5xx.c spi/bfin_spi: only request GPIO on first load 2010-10-22 01:26:46 -06:00
spi_bitbang.c spi/bitbang: reinitialize transfer parameters for every message 2010-07-03 22:59:18 -06:00
spi_bitbang_txrx.h spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_butterfly.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_fsl_espi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_fsl_lib.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_fsl_lib.h dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_fsl_spi.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_gpio.c spi: spi-gpio.c tests SPI_MASTER_NO_RX bit twice, but not SPI_MASTER_NO_TX 2010-10-02 21:09:08 -06:00
spi_imx.c spi/imx: Add i.MX53 support 2011-01-12 22:50:54 -07:00
spi_lm70llp.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_nuc900.c drivers/spi: Remove unnecessary semicolons 2010-11-14 20:57:20 -07:00
spi_ppc4xx.c dt/spi: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
spi_s3c24xx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
spi_s3c24xx_fiq.h
spi_s3c24xx_fiq.S
spi_s3c24xx_gpio.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_s3c64xx.c spi/s3c64xx: Correction for 16,32 bits bus width 2010-09-29 17:31:33 +09:00
spi_sh_msiof.c spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops 2011-01-21 09:26:24 -07:00
spi_sh_sci.c spi/bitbang: add support for SPI_MASTER_NO_{TX, RX} modes 2010-07-03 22:45:44 -06:00
spi_stmp.c
spi_tegra.c spi: tegra: don't treat NULL clk as an error 2011-01-10 16:44:01 -07:00
spi_topcliff_pch.c spi/topcliff: Typo fix threhold to threshold 2010-12-31 17:49:30 -07:00
spi_txx9.c
spidev.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
ti-ssp-spi.c spi: add ti-ssp spi master driver 2011-03-15 08:17:22 -07:00
tle62x0.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
xilinx_spi.c driver-core: remove conditionals around devicetree pointers 2011-01-21 09:24:48 -07:00