From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Sep 2011 23:53:16 +0000 (-0700)
Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: firefly_0821_release~3680^2~4416
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b172e38e435a158cc84169d5b9127a8dd8d21e76;p=firefly-linux-kernel-4.4.55.git

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi: Fix WARN when removing spi-fsl-spi module
  spi/imx: Fix spi-imx when the hardware SPI chipselects are used
---

b172e38e435a158cc84169d5b9127a8dd8d21e76