From: Linus Torvalds 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: https://git.karo-electronics.de/?a=commitdiff_plain;h=365a13a582e6a80c639c54dc2a83b03b9ff0169a;p=linux-beck.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