From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Jun 2011 20:54:46 +0000 (-0700)
Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=365a13a582e6a80c639c54dc2a83b03b9ff0169a;p=openwrt%2Fstaging%2Fblogic.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/rtc-m41t93: Use spi_get_drvdata() for SPI devices
  spi/omap2: fix uninitialized variable
---

365a13a582e6a80c639c54dc2a83b03b9ff0169a