Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

Browse source

* '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"

...

This commit is contained in:

Linus Torvalds 2007-08-03 14:47:07 -07:00

parent 7a883eaf62 ae57988f68

commit 3ff42e4f13

6 changed files with 21 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

drivers/firewire/fw-ohci.c

View file

5

drivers/firewire/fw-sbp2.c

View file

4

drivers/firewire/fw-transaction.c

View file

2

drivers/firewire/fw-transaction.h

View file

2

drivers/ieee1394/Kconfig

View file

5

drivers/ieee1394/sbp2.c

View file