| commit | 365a13a582e6a80c639c54dc2a83b03b9ff0169a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 08 13:54:46 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 08 13:54:46 2011 -0700 |
| tree | d706678393969e2742e23cf88a6469e7124af74d | |
| parent | d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c [diff] | |
| parent | a80fd9db0e1909a03e5d5a29e2e73001e38d12f5 [diff] |
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