Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
commit2d51daaa615e4724f24e43fa01e705c40551080a
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 20:16:27 +0000 (7 12:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 20:16:27 +0000 (7 12:16 -0800)
tree3596123890aae2645a189a75bdf45789e89ae2d9
parentfbce1c234feedb5270468aa4b1770c1cab58a960
parente583685e998e52ebbf31fadf7d8470ae69951660
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

spi changes queued up for v3.3 merge window

* tag 'spi-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
  spi: Fix device unregistration when unregistering the bus master
  spi-topcliff-pch: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
  spi-topcliff-pch: Support new device LAPIS Semiconductor ML7831 IOH
  spi/omap: Correct the error path
  spi/omap: call pm_runtime_disable in error path and remove
  spi/omap: Use a workqueue per omap2_mcspi controller