diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 14:47:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 14:47:07 -0700 |
| commit | 3ff42e4f13095f5351fe651b8a591e67aabbb1a6 (patch) | |
| tree | f79324e46352fcd5de2634b188fc3fc0a71dbf27 /net/sctp/socket.c | |
| parent | 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 (diff) | |
| parent | ae57988f68acdc9fbee649765148f15eb7a1b991 (diff) | |
| download | op-kernel-dev-3ff42e4f13095f5351fe651b8a591e67aabbb1a6.zip op-kernel-dev-3ff42e4f13095f5351fe651b8a591e67aabbb1a6.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fw-core: make two variables static
firewire: fw-ohci: dma_free_coherent needs IRQs enabled
firewire: fw-sbp2: set correct maximum payload (fixes CardBus adapters)
ieee1394: sbp2: more correct Kconfig dependencies
ieee1394: revert "sbp2: enforce 32bit DMA mapping"
Diffstat (limited to 'net/sctp/socket.c')
0 files changed, 0 insertions, 0 deletions
