tree 4e9a65b7810de10141595125cc65f2b0e7533dfc
parent 74a01180db4bbfd61304ae0ba1f60af55ffc803d
parent baed6b82d9f160184c1c14cdb4accb08f3eb6b87
author Linus Torvalds <torvalds@linux-foundation.org> 1252187940 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252187940 -0700

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: sbp2: fix freeing of unallocated memory
  firewire: ohci: fix Ricoh R5C832, video reception
  firewire: ohci: fix Agere FW643 and multiple cameras
  firewire: core: fix crash in iso resource management