From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Jan 2012 20:16:27 +0000 (-0800)
Subject: Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: upstream/snapshot3+hdmi~8440
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d51daaa615e4724f24e43fa01e705c40551080a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

2d51daaa615e4724f24e43fa01e705c40551080a