Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2008 18:31:38 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2008 18:31:38 +0000 (11:31 -0700)
commit886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a
treee5e928b5197c078af184a65fd36d8428f5433683
parent6ed7b6a05dc4332c391134809387220123e82ea7
parentf32ddaddf95d8a30be5a41cf681bc8792bc42ec7
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: fw-sbp2: log scsi_target ID at release
  ieee1394: fix NULL pointer dereference in sysfs access
drivers/ieee1394/nodemgr.c