From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2012 19:17:45 +0000 (-0700)
Subject: Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cf7d8a5550779486524f775c8cf4be9b91365d23;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull SPI bug fixes from Grant Likely:
 "Miscellaneous driver bug fixes.  No major changes in this branch."

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi/imx: prevent NULL pointer dereference in spi_imx_probe()
  spi/imx: mark base member in spi_imx_data as __iomem
  spi/mpc83xx: fix NULL pdata dereference bug
  spi/davinci: Fix DMA API usage in davinci
  spi/pL022: include types.h to remove compilation warnings
---

cf7d8a5550779486524f775c8cf4be9b91365d23