From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 May 2008 18:31:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: v2.6.26-rc1~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a;p=linux-2.6

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: fw-sbp2: log scsi_target ID at release
  ieee1394: fix NULL pointer dereference in sysfs access
---

886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a