Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 20:54:46 +0000 (13:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 20:54:46 +0000 (13:54 -0700)
commit365a13a582e6a80c639c54dc2a83b03b9ff0169a
treed706678393969e2742e23cf88a6469e7124af74d
parentd21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c
parenta80fd9db0e1909a03e5d5a29e2e73001e38d12f5
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