Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Oct 2011 14:28:36 +0000 (07:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Oct 2011 14:28:36 +0000 (07:28 -0700)
commit18c0635363364ca2fc2d1cbd65bbf918daf89d1a
tree6fd1975977b4ab190b77952ee8e263f66e3dc5f7
parent41684f67af75b04152a1714e1a5375dfb00ee3da
parent940ab88962bc1aff3273a8356d64577a6e386736
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6

* 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
  drivercore: Add helper macro for platform_driver boilerplate
  spi: irq: Remove IRQF_DISABLED
  OMAP: SPI: Fix the trying to free nonexistent resource error
  spi/spi-ep93xx: add module.h include
  spi/tegra: fix compilation error in spi-tegra.c
  spi: spi-dw: fix all sparse warnings
  spi/spi-pl022: Call pl022_dma_remove(pl022) only if enable_dma is true
  spi/spi-pl022: calculate_effective_freq() must set rate <= requested rate
  spi/spi-pl022: Don't allocate more sg than required.
  spi/spi-pl022: Use GFP_ATOMIC for allocation from tasklet
  spi/spi-pl022: Resolve formatting issues
drivers/spi/spi-atmel.c
drivers/spi/spi-pl022.c
include/linux/platform_device.h