| commit | b172e38e435a158cc84169d5b9127a8dd8d21e76 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 23 16:53:16 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 23 16:53:16 2011 -0700 |
| tree | 3a43151f8cc66ad84d043ce7e0e4a462240c6d85 | |
| parent | 8ec9c7fb15fd8edf6b34555f5b498033121b2173 [diff] | |
| parent | 387719c2ec995019e0af0dc537ca17c9ebd5b64f [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: Fix WARN when removing spi-fsl-spi module spi/imx: Fix spi-imx when the hardware SPI chipselects are used