]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* '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

1  2 
drivers/ieee1394/nodemgr.c

Simple merge