From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Sep 2009 21:59:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.31-rc9~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f815c335d21f9965f8dbe142fd168aaba1baf98e;p=karo-tx-linux.git

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
---

f815c335d21f9965f8dbe142fd168aaba1baf98e