Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
commitf815c335d21f9965f8dbe142fd168aaba1baf98e
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:59:00 +0000 (5 14:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:59:00 +0000 (5 14:59 -0700)
tree4e9a65b7810de10141595125cc65f2b0e7533dfc
parent74a01180db4bbfd61304ae0ba1f60af55ffc803d
parentbaed6b82d9f160184c1c14cdb4accb08f3eb6b87
Merge branch 'for-linus' of git://git./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
drivers/firewire/sbp2.c