diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-23 19:53:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-23 19:53:16 -0400 |
| commit | b172e38e435a158cc84169d5b9127a8dd8d21e76 (patch) | |
| tree | 3a43151f8cc66ad84d043ce7e0e4a462240c6d85 /fs/btrfs | |
| 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
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions