]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Dec 2009 23:59:05 +0000 (15:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Dec 2009 23:59:05 +0000 (15:59 -0800)
commitbf931a01a2c024a54204b4b02276af6e8d99a2c0
treebd76e2f25430b1394c4dc54cd674bdc08b1bfaf2
parent4e46aa083853a84c770e00b03746bdeaf5c5aeff
parentd53342bf9616ecd7e4a03fece167d0f53b195e87
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi: spi_txx9.c: use resource_size()
  spi: spi_sh_sci.c: use resource_size()
  spi: spi_mpc8xxx.c: use resource_size()
  spi: spi_bfin5xx.c: use resource_size()
  spi: atmel_spi.c: use resource_size()
  spi: Add s3c64xx SPI Controller driver
  atmel_spi: fix dma addr calculation for len > BUFFER_SIZE
  spi_s3c24xx: add FIQ pseudo-DMA support
  spi: controller driver for Designware SPI core
  spidev: add proper section markers
  spidev: use DECLARE_BITMAP instead of declaring the array
drivers/spi/Kconfig
drivers/spi/spi_mpc8xxx.c
drivers/spi/spi_s3c24xx.c
drivers/spi/spi_txx9.c
drivers/spi/spidev.c