Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2012 19:17:45 +0000 (12:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2012 19:17:45 +0000 (12:17 -0700)
commitcf7d8a5550779486524f775c8cf4be9b91365d23
tree0be1d7e7aebcedcd97e1ec9a1af3a190f45a20b4
parent4166fb64593514ad920b7dbd290e0a934b37d24a
parent39ec0d38141b198f94fd19c2bb10fd7c616510d2
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