Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --combined drivers/ieee1394/nodemgr.c
index 29d833e,c6babe8..05710c7
--- 1/drivers/ieee1394/nodemgr.c
--- 2/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@@ -18,8 -18,8 +18,8 @@@
  #include <linux/moduleparam.h>
  #include <linux/mutex.h>
  #include <linux/freezer.h>
 +#include <linux/semaphore.h>
  #include <asm/atomic.h>
 -#include <asm/semaphore.h>
  
  #include "csr.h"
  #include "highlevel.h"
@@@ -520,8 -520,11 +520,11 @@@ static ssize_t fw_show_drv_device_ids(s
        char *scratch = buf;
  
        driver = container_of(drv, struct hpsb_protocol_driver, driver);
+       id = driver->id_table;
+       if (!id)
+               return 0;
  
-       for (id = driver->id_table; id->match_flags != 0; id++) {
+       for (; id->match_flags != 0; id++) {
                int need_coma = 0;
  
                if (id->match_flags & IEEE1394_MATCH_VENDOR_ID) {