From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Oct 2010 18:13:22 +0000 (-0700)
Subject: Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.12-rc1~8554
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=989cd445b48dc996426ab739d002ed504c5c43c9;p=kernel%2Fkernel-generic.git

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

* 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
  of/spi: Fix OF-style driver binding of spi devices
  spi: spi-gpio.c tests SPI_MASTER_NO_RX bit twice, but not SPI_MASTER_NO_TX
  spi/mpc8xxx: fix buffer overrun on large transfers
---

989cd445b48dc996426ab739d002ed504c5c43c9