Revision 3ff42e4f13095f5351fe651b8a591e67aabbb1a6 authored by Linus Torvalds on 03 August 2007, 21:47:07 UTC, committed by Linus Torvalds on 03 August 2007, 21:47:07 UTC
* '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"